From 4096100d40c3cea2c6f0b312832f920277d7c886 Mon Sep 17 00:00:00 2001 From: Laurent Perron Date: Tue, 25 Feb 2025 19:28:53 +0100 Subject: [PATCH] bump scip to 9.2.1 for cmake --- Dependencies.txt | 2 +- cmake/dependencies/CMakeLists.txt | 4 ++-- patches/{scip-v920.patch => scip-v921.patch} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename patches/{scip-v920.patch => scip-v921.patch} (100%) diff --git a/Dependencies.txt b/Dependencies.txt index f39cc1cc25..6b15bab1c1 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=v920 +Scip=v921 # Python pybind11=v2.13.6 pybind11_abseil=v202402.0 diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt index b6b849ec7a..69965037f8 100644 --- a/cmake/dependencies/CMakeLists.txt +++ b/cmake/dependencies/CMakeLists.txt @@ -280,9 +280,9 @@ if(BUILD_SCIP) FetchContent_Declare( scip GIT_REPOSITORY "https://github.com/scipopt/scip.git" - GIT_TAG "v920" + GIT_TAG "v921" GIT_SHALLOW TRUE - PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/scip-v920.patch" + PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/scip-v921.patch" ) FetchContent_MakeAvailable(scip) set(LPI_GLOP_SRC ${scip_SOURCE_DIR}/src/lpi/lpi_glop.cpp PARENT_SCOPE) diff --git a/patches/scip-v920.patch b/patches/scip-v921.patch similarity index 100% rename from patches/scip-v920.patch rename to patches/scip-v921.patch