diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-26 17:58:53 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-27 08:42:18 +0000 |
commit | 981cfe7d79b906090fb20558a6f11bc2224640ed (patch) | |
tree | 58eea4cd3ab35e77468003262a74c250367622e5 /CMakeLists.txt | |
parent | 992fe06b30337442b96e5f8b6553e518fedcd372 (diff) |
Include QtPlatformSupport as part of find_package(Qt6BuildInternals)
This is needed because the ported over requires() clauses from qmake
to CMake are executed before qt_repo_build(), which means that all the
custom platform variables that we set (like LINUX, APPLE_OSX) need
to be available immediately after finding BuildInternals.
Change-Id: I7345b69edf72c266508846766e64f42c99862d1d
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b7803da43..190a39a859 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,12 +18,13 @@ list(PREPEND CMAKE_MODULE_PATH ) ## Find the build internals package. +set(QT_BUILD_INTERNALS_SKIP_CMAKE_MODULE_PATH_ADDITION TRUE) list(PREPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ) find_package(QtBuildInternals CMAKE_FIND_ROOT_PATH_BOTH) - -qt_build_repo_begin(SKIP_CMAKE_MODULE_PATH_ADDITION) +unset(QT_BUILD_INTERNALS_SKIP_CMAKE_MODULE_PATH_ADDITION) +qt_build_repo_begin() ## QtBase specific configure tests: include(QtBaseConfigureTests) |