diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-07-13 09:22:46 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-07-13 14:56:49 +0200 |
| commit | ce9efcf4a901fbb245fc7a9a6605b8c8fc25e91d (patch) | |
| tree | 4c16ae4cc1edc552e7db30163d9fcca69daf0f44 /cmake/QtBuild.cmake | |
| parent | 004d3fab49d90367a070c0ecbd0fda11930ccd22 (diff) | |
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 <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtBuild.cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
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, |