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/QtSetup.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/QtSetup.cmake')
| -rw-r--r-- | cmake/QtSetup.cmake | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake index 16b334fac1..ede764b542 100644 --- a/cmake/QtSetup.cmake +++ b/cmake/QtSetup.cmake @@ -87,8 +87,6 @@ if (PROJECT_NAME STREQUAL "QtBase" AND NOT QT_BUILD_STANDALONE_TESTS) else() set(__qt_will_install_value ON) endif() - set(QT_STAGING_PREFIX "${__qt_prefix}" CACHE INTERNAL - "Install prefix on the build machine. Either CMAKE_INSTALL_PREFIX or CMAKE_STAGING_PREFIX.") set(QT_WILL_INSTALL ${__qt_will_install_value} CACHE BOOL "Boolean indicating if doing a Qt prefix build (vs non-prefix build)." FORCE) unset(__qt_prefix) |