diff options
| -rw-r--r-- | cmake/QtBuild.cmake | 2 | ||||
| -rw-r--r-- | cmake/QtSetup.cmake | 4 |
2 files changed, 4 insertions, 2 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, 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) |