diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-07-06 17:55:30 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-04 23:10:18 +0000 |
| commit | f44e9db471ff2ee8127a44dd26d8fcdcc49ab4e6 (patch) | |
| tree | 159c190864d29bfa0e8230d91e83ac4ef3bac7c7 /.cmake.conf | |
| parent | 91db96f3366cb5ebe5846ac69b593acc4830d2c9 (diff) | |
CMake: Bump min required CMake version for static Qt builds to 3.20
Building a static library Qt configuration will now require a
minimum CMake version of 3.20.
Qt builders and packagers can still opt out of the mentioned minimum
required version by configuring Qt with QT_FORCE_MIN_CMAKE_VERSION.
Such a Qt configuration is /NOT SUPPORTED/.
To facilitate these changes, the minimum version check has been moved
to happen after the BUILD_SHARED_LIBS option is computed by either
QtAutoDetect.cmake or set by a user provided cmake toolchain file.
Introduce a new QT_MIN_SUPPORTED_CMAKE_VERSION_FOR_STATIC_QT variable
in .cmake.conf to mark the minimum version for a static Qt build.
Task-number: QTBUG-95018
Change-Id: Idc1875729f26a7c635b6bd26ac0c1be973917c13
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Craig Scott <craig.scott@qt.io>
(cherry picked from commit 9aa0d99e66b8be2be75d4f3b7fce2b94db9a1e32)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to '.cmake.conf')
| -rw-r--r-- | .cmake.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.cmake.conf b/.cmake.conf index 848faeb55d..ff95a9c186 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -3,6 +3,7 @@ set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") # Minimum requirement for building Qt set(QT_MIN_SUPPORTED_CMAKE_VERSION "3.16") +set(QT_MIN_SUPPORTED_CMAKE_VERSION_FOR_STATIC_QT "3.20") # Policy settings for commands defined by qtbase. These will also be injected # into the top level policy scope of each Qt module when building Qt so that |