Skip to content

Commit 4143672

Browse files
committed
Update
1 parent 38cb186 commit 4143672

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

.github/workflows/hipo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
-DALL_TESTS=${{ matrix.all_tests }} `
6565
-DHIPO=ON `
6666
-DBLAS_ROOT=C:/vcpkg/installed/x64-windows `
67-
-DMETIS_PATH=installs/bin `
67+
-DMETIS_PATH=installs/include `
6868
-DMETIS_LIB="-lmetis" `
6969
..
7070
cmake --build . --parallel --config ${{ matrix.build_type }}

highs/CMakeLists.txt

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -189,10 +189,6 @@ else()
189189
if(APPLE)
190190
target_link_libraries(highs "-framework Accelerate")
191191
target_compile_definitions(highs PRIVATE HIPO_USES_APPLE_BLAS)
192-
elseif(WIN32)
193-
target_link_libraries(highs OpenBLAS::OpenBLAS)
194-
target_compile_definitions(highs PRIVATE HIPO_USES_OPENBLAS)
195-
target_link_libraries(highs metis)
196192
else()
197193
# LINUX
198194
if(BLAS_LIB)
@@ -204,15 +200,8 @@ else()
204200
message(FATAL_ERROR "No BLAS library available")
205201
endif(BLAS_LIB)
206202
endif(APPLE)
207-
208-
if (NOT WIN32)
209-
# Find_package works if deps are installed with vcpkg.
210-
211-
# Metis
212-
target_include_directories(highs PRIVATE "${METIS_PATH}")
213-
target_link_libraries(highs "${METIS_LIB}")
214-
endif()
215-
203+
target_include_directories(highs PRIVATE "${METIS_PATH}")
204+
target_link_libraries(highs "${METIS_LIB}")
216205
endif()
217206

218207

0 commit comments

Comments
 (0)