diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2022-03-18 12:02:17 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-03-20 10:29:12 +0000 |
| commit | 0420b8e8d262e85b8698697bbfc95e90ebf84641 (patch) | |
| tree | b5a6ad1fdcf2e2a1b3524cf96c4ae22fba609e1a | |
| parent | 9362c7ec43eca3bf555bd01ffab8ba1e5f05f11f (diff) | |
Set QT_SUPERBUILD early
That will allow qtbase's .cmake.conf to check whether it is meant to be
used in a superbuild or only for qtbase.
Task-number: QTBUG-101640
Change-Id: I035c86f32497004cc1b8441456604106bacadad4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 14e486a8c43dd364aae2277daced99da19911ed9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ed25c225..a0f4d76c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,10 @@ # 3.16 is the absolute minimum though. cmake_minimum_required(VERSION 3.16...3.20) + +# set QT_SUPERBUILD early, so that qtbase/.cmake.conf can check it +set(QT_SUPERBUILD TRUE) + # Include qtbase's .cmake.conf for access to QT_REPO_MODULE_VERSION set(__qt6_qtbase_src_path "${CMAKE_CURRENT_SOURCE_DIR}/qtbase") include("${__qt6_qtbase_src_path}/.cmake.conf") @@ -37,7 +41,6 @@ include(ECMOptionalAddSubdirectory) if (NOT QT_BUILD_STANDALONE_TESTS) set(QT_NO_CREATE_TARGETS TRUE) endif() -set(QT_SUPERBUILD TRUE) # Get submodule list if not already defined if(NOT QT_BUILD_SUBMODULES) |