Skip to content

Commit 6606425

Browse files
authored
Updated dependencies (#246)
* Updated dependencies * Set CMake build variables to OFF before fetch * Fixed shape dependency location * Fixed shape dependency location
1 parent 2106cbf commit 6606425

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ project(PackingSolver LANGUAGES CXX)
44

55
# Solver options.
66
option(PACKINGSOLVER_USE_CLP "Use CLP" ON)
7-
option(PACKINGSOLVER_USE_HIGHS "Use HiGHS" ON)
87
option(PACKINGSOLVER_USE_KNITRO "Use Knitro" OFF)
98

109
# Build options.

extern/CMakeLists.txt

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,17 @@ if(PACKINGSOLVER_BUILD_TEST)
2424
endif()
2525

2626
# Fetch fontanf/optimizationtools.
27+
set(OPTIMIZATIONTOOLS_BUILD_TEST OFF)
2728
FetchContent_Declare(
2829
optimizationtools
2930
GIT_REPOSITORY https://github.com/fontanf/optimizationtools.git
30-
GIT_TAG 4037a1a03f97ea0c388baa4f3f74c3ba55baec08
31+
GIT_TAG e086ec4cfcc9a885cd63f579a99ea5e8f4737005
3132
#SOURCE_DIR "${PROJECT_SOURCE_DIR}/../optimizationtools/"
3233
EXCLUDE_FROM_ALL)
3334
FetchContent_MakeAvailable(optimizationtools)
3435

3536
# Fetch fontanf/shape.
37+
set(SHAPE_BUILD_TEST OFF)
3638
FetchContent_Declare(
3739
shape
3840
GIT_REPOSITORY https://github.com/fontanf/shape.git
@@ -46,46 +48,50 @@ set(MATHOPTSOLVERSCMAKE_USE_CLP ${PACKINGSOLVER_USE_CLP})
4648
FetchContent_Declare(
4749
mathoptsolverscmake
4850
GIT_REPOSITORY https://github.com/fontanf/mathoptsolverscmake.git
49-
GIT_TAG 4472814a28a40f4d861ccd757e140835c3a31bd0
51+
GIT_TAG f98a9547657a6917659a5397d2f3bb54074293c2
5052
#SOURCE_DIR "${PROJECT_SOURCE_DIR}/../mathoptsolverscmake/"
5153
EXCLUDE_FROM_ALL)
5254
FetchContent_MakeAvailable(mathoptsolverscmake)
5355

5456
# Fetch Highs.
55-
if(PACKINGSOLVER_USE_HIGHS)
56-
set(BUILD_SHARED_LIBS OFF)
57-
FetchContent_Declare(
58-
highs
59-
URL https://github.com/ERGO-Code/HiGHS/archive/refs/tags/v1.7.2.zip
60-
EXCLUDE_FROM_ALL)
61-
FetchContent_MakeAvailable(highs)
62-
endif()
57+
set(BUILD_SHARED_LIBS OFF)
58+
FetchContent_Declare(
59+
highs
60+
URL https://github.com/ERGO-Code/HiGHS/archive/refs/tags/v1.7.2.zip
61+
EXCLUDE_FROM_ALL)
62+
FetchContent_MakeAvailable(highs)
6363

6464
# Fetch fontanf/knapsacksolver.
65+
set(KNAPSACKSOLVER_BUILD_MAIN OFF)
66+
set(KNAPSACKSOLVER_BUILD_TEST OFF)
6567
FetchContent_Declare(
6668
knapsacksolver
6769
GIT_REPOSITORY https://github.com/fontanf/knapsacksolver.git
68-
GIT_TAG abd1acf0704744f5e975e75a1f09cb5a9679e7e8
70+
GIT_TAG 5aee5d72a09fb228033d695fe22dc90dba65ec05
6971
#SOURCE_DIR "${PROJECT_SOURCE_DIR}/../knapsacksolver/"
7072
EXCLUDE_FROM_ALL)
7173
FetchContent_MakeAvailable(knapsacksolver)
7274

7375
# Fetch fontanf/treesearchsolver.
76+
set(TREESEARCHSOLVER_BUILD_TEST OFF)
77+
set(TREESEARCHSOLVER_BUILD_EXAMPLES OFF)
7478
FetchContent_Declare(
7579
treesearchsolver
7680
GIT_REPOSITORY https://github.com/fontanf/treesearchsolver.git
77-
GIT_TAG 1942e11cf38a1fbe559ae15feddd4ced1ef5be4a
81+
GIT_TAG 8cf4a179d103efb9d4e0a94bc2f6f669105cd45a
7882
#SOURCE_DIR "${PROJECT_SOURCE_DIR}/../treesearchsolver/"
7983
EXCLUDE_FROM_ALL)
8084
FetchContent_MakeAvailable(treesearchsolver)
8185

8286
# Fetch fontanf/columngenerationsolver.
8387
set(COLUMNGENERATIONSOLVER_USE_CLP ${PACKINGSOLVER_USE_CLP})
8488
set(COLUMNGENERATIONSOLVER_USE_HIGHS ${PACKINGSOLVER_USE_HIGHS})
89+
set(COLUMNGENERATIONSOLVER_BUILD_TEST OFF)
90+
set(COLUMNGENERATIONSOLVER_BUILD_EXAMPLES OFF)
8591
FetchContent_Declare(
8692
columngenerationsolver
8793
GIT_REPOSITORY https://github.com/fontanf/columngenerationsolver.git
88-
GIT_TAG c661bbd0f05e32161b07db2a28484dbb12d60c10
94+
GIT_TAG c8fb6810e4b040d56bcd93f30c936f40da862fec
8995
#SOURCE_DIR "${PROJECT_SOURCE_DIR}/../columngenerationsolver/"
9096
EXCLUDE_FROM_ALL)
9197
FetchContent_MakeAvailable(columngenerationsolver)

0 commit comments

Comments
 (0)