From ce0b60eb32c9ec71d3ab1f55156535a73aa6426d Mon Sep 17 00:00:00 2001 From: Oliver Lantwin Date: Fri, 13 Mar 2026 09:43:53 +0100 Subject: [PATCH] fix: only require CMake 3.20.0 --- CHANGELOG.md | 3 ++- cmake.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3a89c8d..ecab76f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,8 @@ Until May 2022 (inclusive) no changelog was kept. We might try to reconstruct it ### Changed -* CMake: Update to v4.2.3 +* CMake: Update to v4.2.3, but only require v3.20.0 from system (FairShip + minimum) * python: Require at least 3.12.12 in prefer_system_check * ROOT: Update to 6.36.08 * defaults-actstracking: Removed all overrides unrelated to ACTS or C++20. diff --git a/cmake.sh b/cmake.sh index 95fa2e12..18b81a13 100644 --- a/cmake.sh +++ b/cmake.sh @@ -6,7 +6,7 @@ build_requires: - "GCC-Toolchain:(?!osx)" prefer_system: .* prefer_system_check: | - REQUESTED_VERSION=${REQUESTED_VERSION#v} + REQUESTED_VERSION=3.20.0 verge() { [[ "$1" = "`echo -e "$1\n$2" | sort -V | head -n1`" ]]; } type cmake && verge $REQUESTED_VERSION `cmake --version | sed -e 's/.* //' | cut -d. -f1,2,3` ---