diff options
Diffstat (limited to 'cmake/QtBuild.cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 459c637ca8..6badfd21ce 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -2876,7 +2876,7 @@ function(qt_add_test name) set_tests_properties(${name} PROPERTIES TIMEOUT ${arg_TIMEOUT}) endif() # Get path to qtbase/bin, then prepend this path containing the shared libraries to PATH - set(INSTALL_PREFIX_BIN "${CMAKE_INSTALL_PREFIX}/bin") + set(INSTALL_PREFIX_BIN "${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR}") set_property(TEST "${name}" APPEND PROPERTY ENVIRONMENT "PATH=${CMAKE_CURRENT_BINARY_DIR}${QT_PATH_SEPARATOR}${INSTALL_PREFIX_BIN}${QT_PATH_SEPARATOR}$ENV{PATH}") set_property(TEST "${name}" APPEND PROPERTY ENVIRONMENT "QT_TEST_RUNNING_IN_CTEST=1") @@ -3438,13 +3438,13 @@ function(qt_add_docs) set(doc_project ${ARGV1}) if (NOT QT_SUPERBUILD OR QT_WILL_INSTALL) - set(qdoc_bin "${CMAKE_INSTALL_PREFIX}/bin/qdoc") - set(qtattributionsscanner_bin "${CMAKE_INSTALL_PREFIX}/bin/qtattributionsscanner") - set(qhelpgenerator_bin "${CMAKE_INSTALL_PREFIX}/bin/qhelpgenerator") + set(qdoc_bin "${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR}/qdoc") + set(qtattributionsscanner_bin "${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR}/qtattributionsscanner") + set(qhelpgenerator_bin "${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR}/qhelpgenerator") else() - set(qdoc_bin "${CMAKE_INSTALL_PREFIX}/qtbase/bin/qdoc") - set(qtattributionsscanner_bin "${CMAKE_INSTALL_PREFIX}/qtbase/bin/qtattributionsscanner") - set(qhelpgenerator_bin "${CMAKE_INSTALL_PREFIX}/qtbase/bin/qhelpgenerator") + set(qdoc_bin "${CMAKE_INSTALL_PREFIX}/qtbase/${INSTALL_BINDIR}/qdoc") + set(qtattributionsscanner_bin "${CMAKE_INSTALL_PREFIX}/qtbase/${INSTALL_BINDIR}/qtattributionsscanner") + set(qhelpgenerator_bin "${CMAKE_INSTALL_PREFIX}/qtbase/${INSTALL_BINDIR}/qhelpgenerator") endif() get_target_property(target_type ${target} TYPE) @@ -3948,7 +3948,7 @@ function(qt_generate_qconfig_cpp) # TODO: Clean this up, there's a bunch of unrealistic assumptions here. # See qtConfOutput_preparePaths in qtbase/configure.pri. if(WIN32) - set(lib_location_absolute_path "${CMAKE_INSTALL_PREFIX}/bin") + set(lib_location_absolute_path "${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR}") else() set(lib_location_absolute_path "${CMAKE_INSTALL_PREFIX}/lib") endif() @@ -3957,10 +3957,10 @@ function(qt_generate_qconfig_cpp) if(QT_HOST_PATH) set(host_prefix "${QT_HOST_PATH}") - set(host_bin_dir_absolute_path "${QT_HOST_PATH}/bin") + set(host_bin_dir_absolute_path "${QT_HOST_PATH}/${INSTALL_BINDIR}") else() set(host_prefix "${CMAKE_INSTALL_PREFIX}") - set(host_bin_dir_absolute_path "${CMAKE_INSTALL_PREFIX}/bin") + set(host_bin_dir_absolute_path "${CMAKE_INSTALL_PREFIX}/${INSTALL_BINDIR}") endif() file(RELATIVE_PATH from_host_bin_dir_to_host_prefix |