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 6, 2024
1 parent b97d55a commit 13afcb6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ option(COLUMNGENERATIONSOLVER_USE_CLP "Use CLP" ON)
option(COLUMNGENERATIONSOLVER_USE_CPLEX "Use CPLEX" OFF)
option(COLUMNGENERATIONSOLVER_USE_XPRESS "Use Xpress" OFF)

# Avoid FetchContent warning.
cmake_policy(SET CMP0135 NEW)

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

Expand Down
11 changes: 4 additions & 7 deletions extern/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@ include(FetchContent)
# Fetch boost.
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
URL https://github.com/boostorg/boost/releases/download/boost-1.84.0/boost-1.84.0.tar.xz
EXCLUDE_FROM_ALL)
FetchContent_MakeAvailable(Boost)

Expand All @@ -26,7 +23,7 @@ endif()
FetchContent_Declare(
mathoptsolverscmake
GIT_REPOSITORY https://github.com/fontanf/mathoptsolverscmake.git
GIT_TAG 38d50d4bfe2f7fb2a0c505c398ae3ab3837c57d5
GIT_TAG 80cd13a843e2c10684abbfe76cf9aae0d71ff79d
#SOURCE_DIR "${PROJECT_SOURCE_DIR}/../mathoptsolverscmake/"
EXCLUDE_FROM_ALL)
FetchContent_MakeAvailable(mathoptsolverscmake)
Expand All @@ -35,7 +32,7 @@ FetchContent_MakeAvailable(mathoptsolverscmake)
FetchContent_Declare(
knapsacksolver
GIT_REPOSITORY https://github.com/fontanf/knapsacksolver.git
GIT_TAG edd1332fa2578c2633b6f790a999d1f07ef0978c
GIT_TAG 5115e4db582c97e2e1ade8ea3ab5e678a921b223
#SOURCE_DIR "${PROJECT_SOURCE_DIR}/../knapsacksolver/"
EXCLUDE_FROM_ALL)
FetchContent_MakeAvailable(knapsacksolver)
Expand All @@ -44,7 +41,7 @@ FetchContent_MakeAvailable(knapsacksolver)
FetchContent_Declare(
treesearchsolver
GIT_REPOSITORY https://github.com/fontanf/treesearchsolver.git
GIT_TAG df1a0a1d041b3bc73bf97590dc31ad5e912fd877
GIT_TAG 8e2d5190d4005a753a815641b1e3f8753a9d7095
#SOURCE_DIR "${PROJECT_SOURCE_DIR}/../treesearchsolver/"
EXCLUDE_FROM_ALL)
FetchContent_MakeAvailable(treesearchsolver)

0 comments on commit 13afcb6

Please sign in to comment.