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/QtBuild.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/QtBuild.cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index d4b7924646..ce0c116fd4 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -308,6 +308,8 @@ endif() # 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, # and whether it is a superbuild or non-superbuild. +# A third case is when another module or standalone tests are built against a super-built Qt. +# The layout for the third case is the same as for non-superbuilds. # # These values should be prepended to file paths in commands or properties, # in order to correctly place generated Config files, generated Targets files, |