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 <alexey.edelev@qt.io>
This commit is contained in:
Alexandru Croitor 2024-11-29 13:58:53 +01:00
parent df7091d9f4
commit 5803af38aa
2 changed files with 6 additions and 4 deletions

View File

@ -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)

View File

@ -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)