diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-08-05 13:28:38 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-08-10 16:51:53 +0200 |
| commit | f95a446641ac84c7756d184a7ee996fc538a18c9 (patch) | |
| tree | ba0a773e161ad01889aa1d48d279a546ee21c325 /.cmake.conf | |
| parent | 72a1e55472d0780996cc3843039b00427b5a420b (diff) | |
CMake: Bump min required CMake version for static Qt builds to 3.21
Building a static library Qt configuration will now require a
minimum CMake version of 3.21.
Using such a static library Qt configuration in user projects will now
require the same minimum CMake version of 3.21.
Qt builders and packagers can still opt out of the mentioned minimum
required version by configuring Qt with
QT_FORCE_MIN_CMAKE_VERSION_FOR_BUILDING_QT
and
QT_FORCE_MIN_CMAKE_VERSION_FOR_USING_QT.
Such a Qt configuration is /NOT SUPPORTED/.
Increase the upper range of CMake policies set to NEW to 3.21.
Amends 9aa0d99e66b8be2be75d4f3b7fce2b94db9a1e32
Amends 6518bcc167d47e1c27d082c21551b9a838b04e5d
[ChangeLog][CMake] Building Qt as static libraries now requires
CMake version 3.21 or later. Building user projects with CMake using
that Qt installation also requires a CMake version of 3.21 or later.
Pick-to: 6.2
Fixes: QTBUG-95018
Change-Id: I717b6e1207df46627443b3e5ed430f3c964e2b48
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to '.cmake.conf')
| -rw-r--r-- | .cmake.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.cmake.conf b/.cmake.conf index 12991eebd5..59f5f66a7a 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -3,13 +3,13 @@ set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") # Minimum requirement for building Qt set(QT_SUPPORTED_MIN_CMAKE_VERSION_FOR_BUILDING_QT_SHARED "3.16") -set(QT_SUPPORTED_MIN_CMAKE_VERSION_FOR_BUILDING_QT_STATIC "3.20") +set(QT_SUPPORTED_MIN_CMAKE_VERSION_FOR_BUILDING_QT_STATIC "3.21") # Minimum requirement for consuming Qt in a user project. # This might be different in the future, e.g. be lower than the requirement for # building Qt. set(QT_SUPPORTED_MIN_CMAKE_VERSION_FOR_USING_QT_SHARED "3.16") -set(QT_SUPPORTED_MIN_CMAKE_VERSION_FOR_USING_QT_STATIC "3.20") +set(QT_SUPPORTED_MIN_CMAKE_VERSION_FOR_USING_QT_STATIC "3.21") # 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 @@ -21,4 +21,4 @@ set(QT_SUPPORTED_MIN_CMAKE_VERSION_FOR_USING_QT_STATIC "3.20") # opportunity for substituting the values from here. Keep both locations # in sync. set(QT_MIN_NEW_POLICY_CMAKE_VERSION "3.16") -set(QT_MAX_NEW_POLICY_CMAKE_VERSION "3.20") +set(QT_MAX_NEW_POLICY_CMAKE_VERSION "3.21") |