From ce9efcf4a901fbb245fc7a9a6605b8c8fc25e91d Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 13 Jul 2020 09:22:46 +0200 Subject: CMake: Fix QT_STAGING_PREFIX for repos other than qtbase For repositories other than qtbase the QT_STAGING_PREFIX was empty, because it was only determined in qtbase. Also, we save the CMAKE_STAGING_PREFIX in the Qt6BuildInternals package and set this variable if it's not explicitly set by the user. As with CMAKE_INSTALL_PREFIX this behavior can be prevented by defining QT_BUILD_INTERNALS_NO_FORCE_SET_STAGING_PREFIX=ON. Change-Id: I73100abbef24f5d3fb8f82029d0374176edc8048 Reviewed-by: Alexandru Croitor --- cmake/QtBuild.cmake | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'cmake/QtBuild.cmake') diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 404415a99f..7ad7e6e252 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -125,6 +125,12 @@ qt_configure_process_path(INSTALL_DESCRIPTIONSDIR "${INSTALL_DATADIR}/modules" "Module description files directory") +if(CMAKE_CROSSCOMPILING AND NOT "${CMAKE_STAGING_PREFIX}" STREQUAL "") + set(QT_STAGING_PREFIX "${CMAKE_STAGING_PREFIX}") +else() + set(QT_STAGING_PREFIX "${CMAKE_INSTALL_PREFIX}") +endif() + function(qt_internal_set_up_global_paths) # Compute the values of QT_BUILD_DIR, QT_INSTALL_DIR, QT_CONFIG_BUILD_DIR, QT_CONFIG_INSTALL_DIR # taking into account whether the current build is a prefix build or a non-prefix build, -- cgit v1.2.3