Skip to content

Commit 576ea23

Browse files
author
Release Manager
committed
Trac #34746: Upgrade cmake to 3.24.3, increase minimum system cmake version to 3.11
scip (#31329) fails to build with the older cmake provided by ubuntu- xenial (scipopt/scip#32) papilo (#34726) needs at least cmake 3.11. 3.10.x is shipped on ubuntu-bionic, linuxmint-19. URL: https://trac.sagemath.org/34746 Reported by: mkoeppe Ticket author(s): Matthias Koeppe Reviewer(s): Dima Pasechnik
2 parents 6cc6cf5 + 96a9e22 commit 576ea23

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

build/pkgs/cmake/checksums.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=cmake-VERSION.tar.gz
2-
sha1=abbeedb49c153be4103eabc95f4ffd94440f4d61
3-
md5=f616604606184e3c7b870a57e68a7c3b
4-
cksum=2102786355
2+
sha1=256d6a57a57fa6ceaacd6a2daf708baefd33850c
3+
md5=226dd564164372f9f7d1e21e38e6e8c5
4+
cksum=2080281918
55
upstream_url=https://github.com/Kitware/CMake/releases/download/vVERSION/cmake-VERSION.tar.gz

build/pkgs/cmake/package-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.21.0
1+
3.24.3

build/pkgs/cmake/spkg-configure.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
SAGE_SPKG_CONFIGURE(
22
[cmake], [
3-
AC_CACHE_CHECK([for cmake >= 3.4], [ac_cv_path_CMAKE], [
3+
AC_CACHE_CHECK([for cmake >= 3.11], [ac_cv_path_CMAKE], [
44
AC_PATH_PROGS_FEATURE_CHECK([CMAKE], [cmake], [
55
cmake_version=`$ac_path_CMAKE --version 2>&1 \
66
| $SED -n -e 's/cmake version *\([[0-9]]*\.[[0-9]]*\.[[0-9]]*\)/\1/p'`
77
AS_IF([test -n "$cmake_version"], [
8-
AX_COMPARE_VERSION([$cmake_version], [ge], [3.4], [
8+
AX_COMPARE_VERSION([$cmake_version], [ge], [3.11], [
99
ac_cv_path_CMAKE="$ac_path_CMAKE"
1010
ac_path_CMAKE_found=:
1111
])

0 commit comments

Comments
 (0)