From 99899dd299eccc0a2133b45a04d80cb0e438f773 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 4 Oct 2021 12:20:26 +0200 Subject: Revert "CMake: Warn if cmake_minimum_required has an unsupported low version" This reverts commit 657525965b86cfa135bb5a814a537443163acb14. The change relied on reading the last value of the CMAKE_MINIMUM_REQUIRED_VERSION variable before one of the Qt packages is found to use it for the version check. Even if a user project has a cmake_minimum_required() right at the beginning of the project with a supported version specified, the first project() call which loads a CMake toolchain file could contain another cmake_minimum_required() call with a lower (unsupported) version and that version would be used for the check, failing the project configuration. The Android NDK ships such a toolchain file, which requires version '3.6'. Thus, relying on the last value of CMAKE_MINIMUM_REQUIRED_VERSION is not robust enough. Pick-to: 6.2 Task-number: QTBUG-95018 Task-number: QTBUG-95832 Change-Id: Iff3cb0a46e6e878569dce9c5fe915a714a034904 Reviewed-by: Joerg Bornemann --- cmake/QtModuleConfig.cmake.in | 4 ---- 1 file changed, 4 deletions(-) (limited to 'cmake/QtModuleConfig.cmake.in') diff --git a/cmake/QtModuleConfig.cmake.in b/cmake/QtModuleConfig.cmake.in index 66e90fc6b18..76fde2dc1fc 100644 --- a/cmake/QtModuleConfig.cmake.in +++ b/cmake/QtModuleConfig.cmake.in @@ -1,9 +1,5 @@ @PACKAGE_INIT@ -# Used by __qt_internal_warn_if_project_min_cmake_version_is_not_met -if(NOT _qt_project_last_cmake_minimum_required_version) - set(_qt_project_last_cmake_minimum_required_version "${CMAKE_MINIMUM_REQUIRED_VERSION}") -endif() cmake_minimum_required(VERSION @min_new_policy_version@...@max_new_policy_version@) include(CMakeFindDependencyMacro) -- cgit v1.2.3