Skip to content

Commit

Permalink
Update CMake files
Browse files Browse the repository at this point in the history
  • Loading branch information
fontanf committed Jul 13, 2024
1 parent 1c5b8e7 commit 993ca2e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 deletions.
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ project(SetCoveringSolver LANGUAGES CXX)
option(SETCOVERINGSOLVER_USE_CBC "Use CPLEX" ON)
option(SETCOVERINGSOLVER_USE_GUROBI "Use Gurobi" OFF)

# Avoid FetchContent warning.
cmake_policy(SET CMP0135 NEW)

# Require C++14.
set(CMAKE_CXX_STANDARD 14)

Expand Down
20 changes: 10 additions & 10 deletions extern/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,22 @@
include(FetchContent)

# Fetch boost.
set(BOOST_INCLUDE_LIBRARIES thread filesystem system program_options)
set(BOOST_INCLUDE_LIBRARIES thread filesystem system program_options dynamic_bitset)
set(BOOST_ENABLE_CMAKE ON)
include(FetchContent)
FetchContent_Declare(
Boost
GIT_REPOSITORY https://github.com/boostorg/boost.git
GIT_TAG boost-1.84.0
GIT_SHALLOW TRUE
)
Boost
URL https://github.com/boostorg/boost/releases/download/boost-1.84.0/boost-1.84.0.tar.xz
EXCLUDE_FROM_ALL)
FetchContent_MakeAvailable(Boost)

# Fetch fontanf/optimizationtools.
FetchContent_Declare(
optimizationtools
GIT_REPOSITORY https://github.com/fontanf/optimizationtools.git
GIT_TAG 33a3966ece149d390ec7ce08699669b5267e64aa)
#SOURCE_DIR "${PROJECT_SOURCE_DIR}/../optimizationtools/")
GIT_TAG a0973a7dfa64b9d305f75879c80d252e714ce2cf
#SOURCE_DIR "${PROJECT_SOURCE_DIR}/../optimizationtools/"
EXCLUDE_FROM_ALL)
FetchContent_MakeAvailable(optimizationtools)

# Fetch fontanf/mathoptsolverscmake.
Expand All @@ -31,6 +30,7 @@ endif()
FetchContent_Declare(
mathoptsolverscmake
GIT_REPOSITORY https://github.com/fontanf/mathoptsolverscmake.git
GIT_TAG 56190725f424249a3acd8fce3ff50e08fe675cc6)
#SOURCE_DIR "${PROJECT_SOURCE_DIR}/../mathoptsolverscmake/")
GIT_TAG 80cd13a843e2c10684abbfe76cf9aae0d71ff79d
#SOURCE_DIR "${PROJECT_SOURCE_DIR}/../mathoptsolverscmake/"
EXCLUDE_FROM_ALL)
FetchContent_MakeAvailable(mathoptsolverscmake)

0 comments on commit 993ca2e

Please sign in to comment.