From 48fc2fc3d68cd4348d8f72c2b63eeab0591b22a9 Mon Sep 17 00:00:00 2001 From: Laurent Perron Date: Mon, 21 Apr 2025 20:39:52 +0200 Subject: [PATCH] bump scip to 9.2.2 for cmake --- Dependencies.txt | 2 +- cmake/dependencies/CMakeLists.txt | 4 ++-- patches/BUILD.bazel | 2 +- patches/{scip-v921.patch => scip-v922.patch} | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename patches/{scip-v921.patch => scip-v922.patch} (100%) diff --git a/Dependencies.txt b/Dependencies.txt index 035d1e5541..85bcc6682a 100644 --- a/Dependencies.txt +++ b/Dependencies.txt @@ -10,7 +10,7 @@ Cgl=0.60.9 Cbc=2.10.12 GLPK=5.0 HiGHS=v1.9.0 -Scip=v921 +Scip=v922 # Python pybind11=v2.13.6 pybind11_abseil=v202402.0 diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt index 4833bffdc7..a36c6a5169 100644 --- a/cmake/dependencies/CMakeLists.txt +++ b/cmake/dependencies/CMakeLists.txt @@ -348,10 +348,10 @@ if(BUILD_SCIP) FetchContent_Declare( scip GIT_REPOSITORY "https://github.com/scipopt/scip.git" - GIT_TAG "v921" + GIT_TAG "v922" GIT_SHALLOW TRUE PATCH_COMMAND git apply --ignore-whitespace - "${CMAKE_CURRENT_LIST_DIR}/../../patches/scip-v921.patch" + "${CMAKE_CURRENT_LIST_DIR}/../../patches/scip-v922.patch" ) set(SHARED ON CACHE BOOL "Scip param" FORCE) set(ZLIB ON CACHE BOOL "Scip param" FORCE) diff --git a/patches/BUILD.bazel b/patches/BUILD.bazel index a8dcf5b81c..5c47f00309 100644 --- a/patches/BUILD.bazel +++ b/patches/BUILD.bazel @@ -18,5 +18,5 @@ exports_files([ "pybind11_abseil.patch", "pybind11_protobuf.patch", "pybind11.patch", - "scip-v921.patch", + "scip-v922.patch", ]) diff --git a/patches/scip-v921.patch b/patches/scip-v922.patch similarity index 100% rename from patches/scip-v921.patch rename to patches/scip-v922.patch