Skip to content

Commit 88e7c5b

Browse files
committed
Will this allow it to run on linux?
1 parent 6ab9303 commit 88e7c5b

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,13 @@ if (GCS_ENABLE_HIGHS)
150150
# block()
151151
# set(CMAKE_BUILD_TYPE Debug)
152152
# set(DEBUG_MEMORY "Thread")
153-
FetchContent_Declare(
153+
ExternalProject_Add(
154154
HiGHS
155+
PREFIX ${CMAKE_SOURCE_DIR}/HiGHS
155156
GIT_REPOSITORY https://github.com/ERGO-Code/HiGHS.git
156157
GIT_TAG v1.8.1
158+
INSTALL_COMMAND ""
157159
)
158-
FetchContent_MakeAvailable(HiGHS)
159160
# endblock()
160161
endif (GCS_ENABLE_HIGHS)
161162

examples/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
22
include_directories(${CMAKE_SOURCE_DIR}/generator/src/generator/include)
3+
link_directories(${CMAKE_SOURCE_DIR}/HiGHS/src/HiGHS-build/lib)
34
add_subdirectory(auto_table)
45
add_subdirectory(black_hole)
56
add_subdirectory(cake)

gcs/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ add_library(glasgow_constraint_solver
7070
)
7171

7272
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)
7376

7477
# This appears to be necessary for the python install to work,
7578
# Not sure why exactly...

gcs/innards/proofs/lp_justifier.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ struct LPJustifier::Imp
186186

187187
// First modify the model depending on whether we're inferring contradiction
188188
if (inferring_contradiction) {
189-
std::cout << "Inferring contradiction" << std::endl;
189+
// std::cout << "Inferring contradiction" << std::endl;
190190
// Solving {min 0 : A^Ty = 0, b^Ty <= -1}
191191
auto new_idx = vector<HighsInt>{};
192192
auto new_val = vector<double>{};

0 commit comments

Comments
 (0)