From 5803af38aab09b7e47230a494e14654031d024e7 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 29 Nov 2024 13:58:53 +0100 Subject: [PATCH] CMake: Temporarily allow using any version in Qt's CI So we can raise the minimum CMake version, without having to wait for that CMake version to be provisioned in qt5.git. This change will be reverted later, once the provisioning is done. Task-number: QTBUG-131169 Change-Id: I1ebdc40abcc4a72617bb7742e8dca9bcc16fee94 Reviewed-by: Alexey Edelev --- cmake/QtCMakeVersionHelpers.cmake | 5 +++-- cmake/QtPublicCMakeVersionHelpers.cmake | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cmake/QtCMakeVersionHelpers.cmake b/cmake/QtCMakeVersionHelpers.cmake index 3a3ba0fc750..c2349bd5d15 100644 --- a/cmake/QtCMakeVersionHelpers.cmake +++ b/cmake/QtCMakeVersionHelpers.cmake @@ -169,8 +169,9 @@ function(qt_internal_force_allow_unsuitable_cmake_version_for_building_qt out_va # Temporarily allow any version when building in Qt's CI, so we can decouple the provisioning # of the minimum CMake version from the bump of the minimum CMake version. # The COIN_UNIQUE_JOB_ID env var is set in Qt's CI for both build and test work items. - # Current state is that this check is disabled. - set(allow_any_version_in_ci FALSE) + # Current state is that this check is enabled. + # TODO: Disable it once provisioning is merged. + set(allow_any_version_in_ci TRUE) if(allow_any_version_in_ci AND DEFINED ENV{COIN_UNIQUE_JOB_ID}) set(allow_any_version TRUE) diff --git a/cmake/QtPublicCMakeVersionHelpers.cmake b/cmake/QtPublicCMakeVersionHelpers.cmake index 58c7aa80417..e0046c4ce16 100644 --- a/cmake/QtPublicCMakeVersionHelpers.cmake +++ b/cmake/QtPublicCMakeVersionHelpers.cmake @@ -55,8 +55,9 @@ function(__qt_internal_force_allow_unsuitable_cmake_version_for_using_qt out_var # Temporarily allow any version when using Qt in Qt's CI, so we can decouple the provisioning # of the minimum CMake version from the bump of the minimum CMake version. # The COIN_UNIQUE_JOB_ID env var is set in Qt's CI for both build and test work items. - # Current state is that this check is disabled. - set(allow_any_version_in_ci FALSE) + # Current state is that this check is enabled. + # TODO: Disable it once provisioning is merged. + set(allow_any_version_in_ci TRUE) if(allow_any_version_in_ci AND DEFINED ENV{COIN_UNIQUE_JOB_ID}) set(allow_any_version TRUE)