diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-09 10:53:52 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-09 14:04:31 +0100 |
| commit | 4ea99db8f399cfda63e94a0e82bed4660f20d260 (patch) | |
| tree | 50f289e8df5966a30475065b117166afac2e4809 | |
| parent | 47bcc4dd4bc9f4c4d9e9e6f3198424105385994a (diff) | |
CMake: Fix qt-configure-module location in configure's output
For non-cross-builds, qt-configure-module is located in
CMAKE_INSTALL_PREFIX/bin, not below the staging prefix.
Fixes: QTBUG-88262
Change-Id: Ib6cdd88ece391d5b8ce850b991564e5bed1e475d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | cmake/QtBuildInformation.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cmake/QtBuildInformation.cmake b/cmake/QtBuildInformation.cmake index 2803006321..5a76b2070c 100644 --- a/cmake/QtBuildInformation.cmake +++ b/cmake/QtBuildInformation.cmake @@ -24,6 +24,11 @@ function(qt_print_build_instructions) if(CMAKE_HOST_WIN32) string(APPEND configure_module_command ".bat") endif() + if("${CMAKE_STAGING_PREFIX}" STREQUAL "") + set(local_install_prefix "${CMAKE_INSTALL_PREFIX}") + else() + set(local_install_prefix "${CMAKE_STAGING_PREFIX}") + endif() message("Qt is now configured for building. Just run '${build_command}'\n") if(QT_WILL_INSTALL) @@ -34,7 +39,7 @@ function(qt_print_build_instructions) message("Note that this build cannot be deployed to other machines or devices.") endif() message("\nTo configure and build other Qt modules, you can use the following convenience script: - ${QT_STAGING_PREFIX}/${INSTALL_BINDIR}/${configure_module_command}") + ${local_install_prefix}/${INSTALL_BINDIR}/${configure_module_command}") message("\nIf reconfiguration fails for some reason, try to remove 'CMakeCache.txt' \ from the build directory \n") endfunction() |