diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-04-16 20:06:53 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-04-17 15:59:30 +0200 |
| commit | f4cd66ff0a4da3a9d8a54bc33ecf8bff4002497e (patch) | |
| tree | 917894a9fae9c25353372d9c68bcae03a317c2d9 /cmake/QtSetup.cmake | |
| parent | 67ee92f4d898ee76c40b7efd8e69782a6a4a3754 (diff) | |
CMake: Handle super build non-prefix install prefix correctly
The install prefix in such a case is the qtbase build dir,
and not the qt6 top-level build dir. This caused issues with
certain incorrect paths being generated, including a broken
qt-cmake-standalone-test script, as well as upon reconfiguration
determining that a non-prefix build should be installed.
The fix for a non-prefix build is to check explicitly for
the qtbase build dir. This works both for super and non-super
builds.
Task-number: QTBUG-83496
Change-Id: Ida2393176c4c81da767023ff48159afdedfb0a19
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'cmake/QtSetup.cmake')
| -rw-r--r-- | cmake/QtSetup.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake index 9e50787e72..6bc3c74f69 100644 --- a/cmake/QtSetup.cmake +++ b/cmake/QtSetup.cmake @@ -56,7 +56,7 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) # This detection only happens when building qtbase, and later is propagated via the generated # QtBuildInternalsExtra.cmake file. if (PROJECT_NAME STREQUAL "QtBase" AND NOT QT_BUILD_STANDALONE_TESTS) - if((CMAKE_INSTALL_PREFIX STREQUAL CMAKE_BINARY_DIR) OR + if((CMAKE_INSTALL_PREFIX STREQUAL QtBase_BINARY_DIR) OR (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND FEATURE_developer_build)) set(__qt_will_install_value OFF) @@ -64,7 +64,7 @@ if (PROJECT_NAME STREQUAL "QtBase" AND NOT QT_BUILD_STANDALONE_TESTS) # dir. # While building another repo (like qtsvg), the CMAKE_INSTALL_PREFIX or CMAKE_PREFIX_PATH # (either work) should be set on the command line to point to the qtbase build dir. - set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR} CACHE PATH + set(CMAKE_INSTALL_PREFIX ${QtBase_BINARY_DIR} CACHE PATH "Install path prefix, prepended onto install directories." FORCE) else() set(__qt_will_install_value ON) |