File tree 4 files changed +8
-3
lines changed 4 files changed +8
-3
lines changed Original file line number Diff line number Diff line change @@ -150,12 +150,13 @@ if (GCS_ENABLE_HIGHS)
150
150
# block()
151
151
# set(CMAKE_BUILD_TYPE Debug)
152
152
# set(DEBUG_MEMORY "Thread")
153
- FetchContent_Declare (
153
+ ExternalProject_Add (
154
154
HiGHS
155
+ PREFIX ${CMAKE_SOURCE_DIR} /HiGHS
155
156
GIT_REPOSITORY https://github.com/ERGO-Code/HiGHS.git
156
157
GIT_TAG v1.8.1
158
+ INSTALL_COMMAND ""
157
159
)
158
- FetchContent_MakeAvailable(HiGHS)
159
160
# endblock()
160
161
endif (GCS_ENABLE_HIGHS)
161
162
Original file line number Diff line number Diff line change 1
1
set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR} )
2
2
include_directories (${CMAKE_SOURCE_DIR} /generator/src/generator/include )
3
+ link_directories (${CMAKE_SOURCE_DIR} /HiGHS/src/HiGHS-build /lib)
3
4
add_subdirectory (auto_table)
4
5
add_subdirectory (black_hole)
5
6
add_subdirectory (cake)
Original file line number Diff line number Diff line change @@ -70,6 +70,9 @@ add_library(glasgow_constraint_solver
70
70
)
71
71
72
72
include_directories (${CMAKE_SOURCE_DIR} /generator/src/generator/include )
73
+ include_directories (${CMAKE_SOURCE_DIR} /HiGHS/src/HiGHS/src)
74
+ include_directories (${CMAKE_SOURCE_DIR} /HiGHS/src/HiGHS-build )
75
+ link_directories (${CMAKE_SOURCE_DIR} /HiGHS/src/HiGHS-build /lib)
73
76
74
77
# This appears to be necessary for the python install to work,
75
78
# Not sure why exactly...
Original file line number Diff line number Diff line change @@ -186,7 +186,7 @@ struct LPJustifier::Imp
186
186
187
187
// First modify the model depending on whether we're inferring contradiction
188
188
if (inferring_contradiction) {
189
- std::cout << " Inferring contradiction" << std::endl;
189
+ // std::cout << "Inferring contradiction" << std::endl;
190
190
// Solving {min 0 : A^Ty = 0, b^Ty <= -1}
191
191
auto new_idx = vector<HighsInt>{};
192
192
auto new_val = vector<double >{};
You can’t perform that action at this time.
0 commit comments