From 4ea99db8f399cfda63e94a0e82bed4660f20d260 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 9 Nov 2020 10:53:52 +0100 Subject: 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 --- cmake/QtBuildInformation.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'cmake') 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() -- cgit v1.2.3