diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-11-02 09:19:35 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-11-02 13:06:22 +0100 |
commit | b54dd671aac4dc22a2ad4db7ad9bbaf77ba5a81b (patch) | |
tree | f683855549d7339933fa85b4e5206c422539dcad | |
parent | 4b694032dfe61dd9190170d15ee2edddbc9dfd7c (diff) |
CMake: Bump the minimum required CMake version to use Qt to 3.14
At the moment our examples require a minimum of 3.14 due to changes
in upstream CMake's Autogen functionatlity to support Qt 6. Anything
lower would simply not work with Qt 6.
It's not clear yet if we actually want to require 3.14, or something
higher. At the very least there were many significant changes to
support iOS in CMake 3.15.
But for now just bump the version checked by Qt6Config.cmake to be
consistent with what's in our examples.
Task-number: QTBUG-88086
Change-Id: I119c2ad05a18c357fe7c659b30685af87475fc84
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
-rw-r--r-- | cmake/QtConfig.cmake.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtConfig.cmake.in b/cmake/QtConfig.cmake.in index f2020ec012..d6d6d179d2 100644 --- a/cmake/QtConfig.cmake.in +++ b/cmake/QtConfig.cmake.in @@ -11,8 +11,8 @@ if (CMAKE_CROSSCOMPILING AND CMAKE_SYSROOT) endif() # Slightly amended version of ./src/corelib/Qt6Config.cmake.in -if (CMAKE_VERSION VERSION_LESS 3.1.0) - message(FATAL_ERROR "Qt requires at least CMake version 3.1.0") +if (CMAKE_VERSION VERSION_LESS 3.14) + message(FATAL_ERROR "Qt requires at least CMake version 3.14") endif() get_filename_component(_qt_cmake_dir "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE) |