Skip to content

Commit

Permalink
remove BOOST_ALL_NO_LIB if building for windows
Browse files Browse the repository at this point in the history
- not possible with current boost due to
  boostorg/serialization#232
  • Loading branch information
svigerske committed Nov 5, 2024
1 parent 53b4883 commit 5f6365a
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 0 deletions.
20 changes: 20 additions & 0 deletions recipe/0001-disable-boost-no-lib.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--- a/papilo/CMakeLists.txt
+++ b/papilo/CMakeLists.txt
@@ -214,7 +214,6 @@ write_basic_package_version_file(
)

if(MSVC)
- target_compile_definitions(papilo INTERFACE BOOST_ALL_NO_LIB)
target_compile_options(papilo INTERFACE /bigobj)
target_compile_options(papilo INTERFACE ${TBB_CXX_STD_FLAG})
else()
--- a/soplex/CMakeLists.txt
+++ b/soplex/CMakeLists.txt
@@ -211,7 +211,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
add_definitions(/wd4100)
add_definitions(/wd4661)
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
- add_definitions(-DBOOST_ALL_NO_LIB)
# set MT or MTd flag when using the static VS runtime libraries
if(MT)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
3 changes: 3 additions & 0 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ source:
- url: https://scipopt.org/download/release/scipoptsuite-{{ scip_version }}.tgz
sha256: 331d9f30367add81518d95d353085dd051f3caf80f167548f8dd62d2ed959a6c
folder: scipoptsuite
patches:
# header-only does not work with current boost due to https://github.com/boostorg/serialization/issues/232
- 0001-disable-boost-no-lib.patch # [win]

build:
number: 2
Expand Down

0 comments on commit 5f6365a

Please sign in to comment.