From bef5bd6dc4da141574e9f81b7b74ba1f699c4e12 Mon Sep 17 00:00:00 2001
From: Corentin Le Molgat <corentinl@google.com>
Date: Wed, 24 Sep 2025 18:19:58 +0200
Subject: [PATCH] cmake: bump Scip to v923

note: can't bump bazel since scip v923 is not available on BCR
---
 Dependencies.txt                             |  2 +-
 cmake/dependencies/CMakeLists.txt            |  4 ++--
 patches/{scip-v922.patch => scip-v923.patch} | 21 +++++---------------
 3 files changed, 8 insertions(+), 19 deletions(-)
 rename patches/{scip-v922.patch => scip-v923.patch} (90%)

diff --git a/Dependencies.txt b/Dependencies.txt
index c4fa4626ed..082f2c8354 100644
--- a/Dependencies.txt
+++ b/Dependencies.txt
@@ -10,7 +10,7 @@ Cgl=0.60.9
 Cbc=2.10.12
 GLPK=5.0
 HiGHS=v1.11.0
-Scip=v922
+Scip=v923
 # Python
 pybind11=v2.13.6
 pybind11_abseil=v202402.0
diff --git a/cmake/dependencies/CMakeLists.txt b/cmake/dependencies/CMakeLists.txt
index 0e474017e4..d14cd5342a 100644
--- a/cmake/dependencies/CMakeLists.txt
+++ b/cmake/dependencies/CMakeLists.txt
@@ -381,11 +381,11 @@ if(BUILD_SCIP)
   FetchContent_Declare(
     scip
     GIT_REPOSITORY "https://github.com/scipopt/scip.git"
-    GIT_TAG        "v922"
+    GIT_TAG        "v923"
     GIT_SHALLOW TRUE
     UPDATE_COMMAND git reset --hard
     PATCH_COMMAND git apply --ignore-whitespace
-    "${CMAKE_CURRENT_LIST_DIR}/../../patches/scip-v922.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/../../patches/scip-v923.patch"
   )
   set(SHARED ON CACHE BOOL "Scip param" FORCE)
   set(ZLIB ON CACHE BOOL "Scip param" FORCE)
diff --git a/patches/scip-v922.patch b/patches/scip-v923.patch
similarity index 90%
rename from patches/scip-v922.patch
rename to patches/scip-v923.patch
index b1093c9e34..eb05ff90d1 100644
--- a/patches/scip-v922.patch
+++ b/patches/scip-v923.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 38ac7845..9b0d4fcb 100644
+index 38917b8e..a8dff6e9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -38,9 +38,11 @@ set(CPACK_PACKAGE_VENDOR "Zuse Institute Berlin")
@@ -105,21 +105,10 @@ index 559552f9..682ac40a 100644
  set(SCIP_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@")
  set(SCIP_FOUND TRUE)
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index d6dd3acf..a146ddec 100644
+index be3760c4..b764f0b4 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -5,8 +5,8 @@ include(GNUInstallDirs)
- 
- function(setLibProperties targetname outputname)
-     set_target_properties(${targetname} PROPERTIES
--        OUTPUT_NAME ${outputname}
--        MACOSX_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-+      OUTPUT_NAME ${outputname}
-+    )
- endfunction(setLibProperties)
- 
- set(CMAKE_C_STANDARD 99)
-@@ -1112,6 +1112,13 @@ target_link_libraries(scip
+@@ -1115,6 +1115,13 @@ target_link_libraries(scip
  add_dependencies(libscip scip_update_githash)
  add_dependencies(scip scip_update_githash)
  
@@ -133,7 +122,7 @@ index d6dd3acf..a146ddec 100644
  set_target_properties(libscip PROPERTIES
      VERSION ${SCIP_VERSION_MAJOR}.${SCIP_VERSION_MINOR}.${SCIP_VERSION_PATCH}.${SCIP_VERSION_SUB}
      SOVERSION ${SCIP_VERSION_MAJOR}.${SCIP_VERSION_MINOR}
-@@ -1150,17 +1157,8 @@ install(TARGETS scip libscip EXPORT scip-targets
+@@ -1153,17 +1160,8 @@ install(TARGETS scip libscip EXPORT scip-targets
          INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
  
  # Add all targets to the build-tree export set
@@ -153,7 +142,7 @@ index d6dd3acf..a146ddec 100644
  
  # configure the config file for the build tree
  set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/src" "${PROJECT_BINARY_DIR}")
-@@ -1176,18 +1174,16 @@ ${PROJECT_BINARY_DIR}/scip-config-version.cmake
+@@ -1179,18 +1177,16 @@ ${PROJECT_BINARY_DIR}/scip-config-version.cmake
  
  #configure the config file for the install
  set(CONF_INCLUDE_DIRS "\${CMAKE_CURRENT_LIST_DIR}/../../../include")