From 981cfe7d79b906090fb20558a6f11bc2224640ed Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 26 Sep 2019 17:58:53 +0200 Subject: 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 --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') 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) -- cgit v1.2.3