From 5102548a5cb5d785f9fe54aa7988d740b302db7d Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Fri, 15 Nov 2024 14:53:46 +0100 Subject: [PATCH] deps: Bump SCIP to v920 --- Dependencies.txt | 2 +- cmake/dependencies/CMakeLists.txt | 4 ++-- patches/{scip-v900.patch => scip-v920.patch} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename patches/{scip-v900.patch => scip-v920.patch} (100%) diff --git a/Dependencies.txt b/Dependencies.txt index 23cc7b11eb..39452cf854 100644 --- a/Dependencies.txt +++ b/Dependencies.txt @@ -10,7 +10,7 @@ Cgl=0.60.5 Cbc=2.10.7 GLPK=5.0 HiGHS=v1.8.0 -Scip=v900 +Scip=v920 # Python pybind11=v2.12.0 pybind11_abseil=52f2739 diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt index 2fa8d309de..a6f9631906 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 "v900" + GIT_TAG "v920" GIT_SHALLOW TRUE - PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/scip-v900.patch" + PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/scip-v920.patch" ) FetchContent_MakeAvailable(scip) set(LPI_GLOP_SRC ${scip_SOURCE_DIR}/src/lpi/lpi_glop.cpp PARENT_SCOPE) diff --git a/patches/scip-v900.patch b/patches/scip-v920.patch similarity index 100% rename from patches/scip-v900.patch rename to patches/scip-v920.patch