always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: fix soplex boost check in a super build

Browse Source
This commit is contained in:
Corentin Le Molgat
2026-01-05 17:43:50 +01:00
parent a790483ba1
commit 4f5557884f
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/dependencies/CMakeLists.txt
View File

@@ -345,6 +345,7 @@ if(BUILD_Boost)
UPDATE_COMMAND git reset --hard --recurse-submodules UPDATE_COMMAND git reset --hard --recurse-submodules
PATCH_COMMAND git apply --ignore-whitespace PATCH_COMMAND git apply --ignore-whitespace
"${CMAKE_CURRENT_LIST_DIR}/../../patches/boost-1.87.0.patch" "${CMAKE_CURRENT_LIST_DIR}/../../patches/boost-1.87.0.patch"
OVERRIDE_FIND_PACKAGE # Needed for Soplex
SYSTEM SYSTEM
) )
set(BOOST_INCLUDE_LIBRARIES multiprecision serialization) set(BOOST_INCLUDE_LIBRARIES multiprecision serialization)

8
patches/soplex-v8.0.0.patch
View File

@@ -1,7 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9511442..58a8a58 100644 index 9511442..3993fc4 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.25)
# FindBoost is removed in version cmake 3.30
if(POLICY CMP0167)
@@ -31,6 +31,10 @@ set(CPACK_PACKAGE_VERSION_PATCH "${SOPLEX_VERSION_PATCH}") @@ -31,6 +31,10 @@ set(CPACK_PACKAGE_VERSION_PATCH "${SOPLEX_VERSION_PATCH}")
set(CPACK_PACKAGE_VENDOR "Zuse Institute Berlin") set(CPACK_PACKAGE_VENDOR "Zuse Institute Berlin")
include(CPack) include(CPack)