From 4180e9c5111faae9b242253e2ab215154174507d Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 21 Jul 2021 17:41:57 +0200 Subject: CMake: Remove CMake minimum version check in top-level project The check is done in qtbase instead. Trying to do it in the top-level project is cumbersome due to needing to know whether it will be a static or shared Qt build. It's also cumbersome because the top-level build used to use qtbase's minimum cmake version values and that can get awkward to handle with submodule dependency updates. Replace the check with a regular minimum required call. The minimum version is 3.16 and the upper range value for NEW policy assignments is 3.20, while 3.21.0 is still kind of fresh and has some AUTOUIC issues. As a drive-by, add a clarifying comment about QtAutoDetect.cmake. Pick-to: 6.2 Task-number: QTBUG-95018 Change-Id: Ifb4ec0b4ed7f56ab0179feb79072c93d1d66ce63 Reviewed-by: Craig Scott Reviewed-by: Alexandru Croitor --- CMakeLists.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 6baa7067..ed25c225 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,13 @@ -set(__qt6_qtbase_src_path "${CMAKE_CURRENT_SOURCE_DIR}/qtbase") +# The real minimum version will be checked by the qtbase project. +# 3.16 is the absolute minimum though. +cmake_minimum_required(VERSION 3.16...3.20) +# 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") -include("${__qt6_qtbase_src_path}/cmake/QtCMakeVersionHelpers.cmake") -qt_internal_check_for_suitable_cmake_version() -qt_internal_get_computed_minimum_cmake_version(__qt_minimum_cmake_version) -cmake_minimum_required(VERSION ${__qt_minimum_cmake_version}) +# Run platform auto-detection /before/ the first project() call and thus +# before the toolchain file is loaded. include("${__qt6_qtbase_src_path}/cmake/QtAutoDetect.cmake") project(Qt -- cgit v1.2.3