cmake: bump scip to v10.0.2

* bump soplex to v8.0.2
* remove boost dependencies (only needed by soplex binaries)

Author: Mizux

CMakeLists.txt

@@ -291,18 +291,14 @@ message(STATUS "Build PDLP: ${BUILD_PDLP}")
 option(USE_SCIP "Use the Scip solver" ON)
 message(STATUS "SCIP support: ${USE_SCIP}")
 if(USE_SCIP)
-  CMAKE_DEPENDENT_OPTION(BUILD_Boost "Build the Boost dependency Library" OFF
-    "NOT BUILD_DEPS" ON)
   CMAKE_DEPENDENT_OPTION(BUILD_soplex "Build the Soplex dependency Library" OFF
     "NOT BUILD_DEPS" ON)
   CMAKE_DEPENDENT_OPTION(BUILD_SCIP "Build the SCIP dependency Library" OFF
     "NOT BUILD_DEPS" ON)
 else()
-  set(BUILD_Boost OFF)
   set(BUILD_soplex OFF)
   set(BUILD_SCIP OFF)
 endif()
-message(STATUS "Build Boost (Soplex requirement): ${BUILD_Boost}")
 message(STATUS "Build Soplex (SCIP requirement): ${BUILD_soplex}")
 message(STATUS "Build SCIP: ${BUILD_SCIP}")
 

cmake/dependencies/CMakeLists.txt

@@ -324,34 +324,6 @@ if(BUILD_HIGHS)
   message(CHECK_PASS "fetched")
 endif()
 
-# ##############################################################################
-# BOOST
-# ##############################################################################
-if(BUILD_Boost)
-  message(CHECK_START "Fetching Boost")
-  list(APPEND CMAKE_MESSAGE_INDENT "  ")
-  FetchContent_Declare(
-    Boost
-    GIT_REPOSITORY "https://github.com/boostorg/boost.git"
-    GIT_TAG "boost-1.87.0"
-    GIT_SHALLOW TRUE
-    GIT_SUBMODULES_RECURSE TRUE
-    UPDATE_COMMAND git reset --hard --recurse-submodules
-    PATCH_COMMAND git apply --ignore-whitespace
-    "${CMAKE_CURRENT_LIST_DIR}/../../patches/boost-1.87.0.patch"
-    OVERRIDE_FIND_PACKAGE # Needed for Soplex
-    SYSTEM
-  )
-  set(BOOST_INCLUDE_LIBRARIES multiprecision serialization)
-  option(BOOST_SKIP_INSTALL_RULES NO)
-  set(BOOST_ENABLE_CMAKE ON)
-  set(BUILD_SHARED_LIBS OFF)
-  FetchContent_MakeAvailable(Boost)
-  set(BUILD_SHARED_LIBS ON)
-  list(POP_BACK CMAKE_MESSAGE_INDENT)
-  message(CHECK_PASS "fetched")
-endif()
-
 # ##############################################################################
 # SOPLEX
 # ##############################################################################
@@ -361,17 +333,17 @@ if(BUILD_soplex)
   FetchContent_Declare(
     soplex
     GIT_REPOSITORY "https://github.com/scipopt/soplex.git"
-    GIT_TAG        "v8.0.0"
+    GIT_TAG        "v8.0.2"
     GIT_SHALLOW TRUE
     UPDATE_COMMAND git reset --hard
     PATCH_COMMAND git apply --ignore-whitespace
-    "${CMAKE_CURRENT_LIST_DIR}/../../patches/soplex-v8.0.0.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/../../patches/soplex-v8.0.2.patch"
     SYSTEM
   )
   set(SHARED ON CACHE BOOL "Soplex param" FORCE)
   set(ZLIB ON CACHE BOOL "Soplex param" FORCE)
   set(GMP OFF CACHE BOOL "Soplex param" FORCE)
-  set(BOOST ON CACHE BOOL "Soplex param" FORCE)
+  set(BOOST OFF CACHE BOOL "Soplex param" FORCE)
   set(QUADMATH  OFF CACHE BOOL "Soplex param" FORCE)
   set(MPFR OFF CACHE BOOL "Soplex param" FORCE)
   set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON CACHE BOOL "Soplex param" FORCE)
@@ -392,11 +364,11 @@ if(BUILD_SCIP)
   FetchContent_Declare(
     scip
     GIT_REPOSITORY "https://github.com/scipopt/scip.git"
-    GIT_TAG        "v10.0.0"
+    GIT_TAG        "v10.0.2"
     GIT_SHALLOW TRUE
     UPDATE_COMMAND git reset --hard
     PATCH_COMMAND git apply --ignore-whitespace
-    "${CMAKE_CURRENT_LIST_DIR}/../../patches/scip-v10.0.0.patch"
+    "${CMAKE_CURRENT_LIST_DIR}/../../patches/scip-v10.0.2.patch"
     SYSTEM
   )
   set(SHARED ON CACHE BOOL "Scip param" FORCE)

patches/boost-1.87.0.patch

@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b3c57799..eeeca4c8 100644
+index e12c43fb..cc1b6970 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -52,9 +52,11 @@ set(CPACK_PACKAGE_VENDOR "Zuse Institute Berlin")
@@ -107,33 +107,3 @@ index c6ce7283..6b6b1fc8 100644
  install(FILES "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/scip-config.cmake"
                ${PROJECT_BINARY_DIR}/scip-config-version.cmake
          DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/scip)
-diff --git a/src/tinycthread/tinycthread.h b/src/tinycthread/tinycthread.h
-index e0f4823c..29ca4f1e 100644
---- a/src/tinycthread/tinycthread.h
-+++ b/src/tinycthread/tinycthread.h
-@@ -450,8 +450,12 @@ int tss_set(tss_t key, void *val);
-   } once_flag;
-   #define ONCE_FLAG_INIT {0,}
- #else
--  #define once_flag pthread_once_t
--  #define ONCE_FLAG_INIT PTHREAD_ONCE_INIT
-+  /* Check if the system already provides C11 threads or once_flag */
-+  #if !defined(__once_flag_defined)
-+    typedef pthread_once_t once_flag;
-+    #define ONCE_FLAG_INIT PTHREAD_ONCE_INIT
-+    #define __once_flag_defined
-+  #endif
- #endif
- 
- /** Invoke a callback exactly once
-@@ -462,7 +466,9 @@ int tss_set(tss_t key, void *val);
- #if defined(_TTHREAD_WIN32_)
-   void call_once(once_flag *flag, void (*func)(void));
- #else
--  #define call_once(flag,func) pthread_once(flag,func)
-+  inline void call_once(once_flag *flag, void (*func)(void)) {
-+    pthread_once(flag, func);
-+  }
- #endif
- 
- #ifdef __cplusplus

patches/scip-v10.0.0.patch patches/scip-v10.0.2.patchpatches/scip-v10.0.0.patch renamed to patches/scip-v10.0.2.patch

@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9511442..3993fc4 100644
+index 1c00fb3..6d2f282 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -1,4 +1,4 @@
@@ -49,7 +49,7 @@ index 9511442..3993fc4 100644
 
  # set function visibility default to hidden
  set(CMAKE_CXX_VISIBILITY_PRESET hidden)
-@@ -124,12 +136,11 @@ if(COVERAGE)
+@@ -127,12 +139,11 @@ if(COVERAGE)
  endif()
 
  if(ZLIB)
@@ -67,67 +67,7 @@ index 9511442..3993fc4 100644
  endif()
 
  if(GMP)
-@@ -171,42 +182,24 @@ else()
-     set(SOPLEX_WITH_PAPILO off)
- endif()
- 
--set(BOOST_MINIMUM_VERSION 1.65.0)
-+set(BOOST_MINIMUM_VERSION 1.65.0) # PaPILO requires at least Boost 1.65 (on mac 1.72)
- if(BOOST)
--    find_package(Boost ${BOOST_MINIMUM_VERSION}) # PaPILO requires at least Boost 1.65 (on mac 1.72)
--    if(Boost_FOUND)
--        set(SOPLEX_WITH_BOOST on)
--        if(NOT Boost_VERSION_MACRO)
--           set(Boost_VERSION_MACRO ${Boost_VERSION})
--        endif()
--        if(${Boost_VERSION_MACRO} LESS "107000")
--            if(NOT SOPLEX_WITH_GMP)
--               message(SEND_ERROR "If no GMP is linked, then the minimal Boost verion is 1.70. \
--                       Found Boost version is ${Boost_VERSION_STRING}. Either provide newer Boost, link GMP, or disable Boost by setting BOOST=off.")
--            else()
--               message(WARNING "The multiprecision and quadprecision features are disabled with Boost versions older than 1.70. \
--                       Found Boost version is ${Boost_VERSION_STRING}.")
--            endif()
--        endif()
--        if(Boost_DIR)
--            message(STATUS "Found Boost: ${Boost_DIR}")
--        endif()
--        set(libs ${libs} Boost::boost)
--        if(MPFR) # MPFR is used within boost multiprecision, so using it without Boost does not make sense
--            find_package(MPFR)
--        endif()
--        if(MPFR_FOUND)
--            message(STATUS "SoPlex with Boost MPFR ${MPFR_VERSION} libraries")
--            set(SOPLEX_WITH_MPFR on)
--            include_directories(${MPFR_INCLUDE_DIRS})
--            set(libs ${libs} ${MPFR_LIBRARIES})
--        else()
--            message(STATUS "SoPlex with Boost CPP multiprecision libraries")
--            set(SOPLEX_WITH_CPPMPF on)
--        endif()
--    else()
--        set(BOOST off)
--    endif()
-+  if(NOT TARGET Boost::multiprecision OR NOT TARGET Boost::serialization)
-+    message(FATAL_ERROR "Boost::multiprecision or Boost::serialization not available!!!")
-+    find_package(Boost ${BOOST_MINIMUM_VERSION} REQUIRED)
-+  endif()
-+  set(SOPLEX_WITH_BOOST on)
-+  set(libs ${libs} Boost::multiprecision Boost::serialization)
-+  if(MPFR) # MPFR is used within boost multiprecision, so using it without Boost does not make sense
-+    find_package(MPFR REQUIRED)
-+    message(STATUS "SoPlex with Boost MPFR libraries")
-+    set(SOPLEX_WITH_MPFR on)
-+    include_directories(${MPFR_INCLUDE_DIRS})
-+    set(libs ${libs} ${MPFR_LIBRARIES})
-+  else()
-+    message(STATUS "SoPlex with Boost CPP multiprecision libraries")
-+    set(SOPLEX_WITH_CPPMPF on)
-+  endif()
- endif()
- 
- # disable fused floating point contraction to enhance reproducibility across compilers and architectures
-@@ -251,7 +244,7 @@ set(EXTRA_CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
+@@ -254,7 +265,7 @@ set(EXTRA_CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
  configure_file(${PROJECT_SOURCE_DIR}/soplex-config.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/soplex-config.cmake" @ONLY)
 
  add_subdirectory(src)
@@ -140,7 +80,7 @@ index 9511442..3993fc4 100644
 +  add_subdirectory(check)
 +endif()
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index d57c5fe..11f914a 100644
+index f3758e1..ecde9ae 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -193,28 +193,32 @@ target_link_libraries(libsoplexshared libsoplex ${libs})