Skip to content

Commit a3f6942

Browse files
committed
test
1 parent 9f7beea commit a3f6942

File tree

4 files changed

+37
-27
lines changed

4 files changed

+37
-27
lines changed

.github/workflows/hipo-macos.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,9 @@ jobs:
6161
working-directory: ${{runner.workspace}}/build
6262
run: |
6363
cmake $GITHUB_WORKSPACE -DHIPO=ON \
64-
-DMETIS_ROOT=${{runner.workspace}}/installs \
65-
-DGKLIB_ROOT=${{runner.workspace}}/installs
64+
-DMETIS_ROOT=${{runner.workspace}}/installs
65+
66+
# -DGKLIB_ROOT=${{runner.workspace}}/installs
6667

6768
- name: Build
6869
working-directory: ${{runner.workspace}}/build
@@ -137,9 +138,10 @@ jobs:
137138
run: |
138139
cmake $GITHUB_WORKSPACE -DHIPO=ON \
139140
-DMETIS_ROOT=${{runner.workspace}}/installs \
140-
-DGKLIB_ROOT=${{runner.workspace}}/installs \
141141
-DCMAKE_BUILD_TYPE=Debug
142142
143+
# -DGKLIB_ROOT=${{runner.workspace}}/installs \
144+
143145
- name: Build
144146
working-directory: ${{runner.workspace}}/build
145147
run: |
@@ -212,8 +214,9 @@ jobs:
212214
working-directory: ${{runner.workspace}}/build
213215
run: |
214216
cmake $GITHUB_WORKSPACE -DHIPO=ON -DALL_TESTS=ON \
215-
-DMETIS_ROOT=${{runner.workspace}}/installs \
216-
-DGKLIB_ROOT=${{runner.workspace}}/installs
217+
-DMETIS_ROOT=${{runner.workspace}}/installs
218+
219+
# -DGKLIB_ROOT=${{runner.workspace}}/installs
217220

218221
- name: Build
219222
working-directory: ${{runner.workspace}}/build
@@ -288,9 +291,10 @@ jobs:
288291
run: |
289292
cmake $GITHUB_WORKSPACE -DHIPO=ON -DALL_TESTS=ON \
290293
-DMETIS_ROOT=${{runner.workspace}}/installs \
291-
-DGKLIB_ROOT=${{runner.workspace}}/installs \
292294
-DCMAKE_BUILD_TYPE=Debug
293295
296+
# -DGKLIB_ROOT=${{runner.workspace}}/installs \
297+
294298
- name: Build
295299
working-directory: ${{runner.workspace}}/build
296300
run: |

.github/workflows/hipo-ubuntu.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,9 @@ jobs:
8585
working-directory: ${{runner.workspace}}/build
8686
run: |
8787
cmake $GITHUB_WORKSPACE -DHIPO=ON \
88-
-DMETIS_ROOT=${{runner.workspace}}/installs \
89-
-DGKLIB_ROOT=${{runner.workspace}}/installs
88+
-DMETIS_ROOT=${{runner.workspace}}/installs
89+
90+
# -DGKLIB_ROOT=${{runner.workspace}}/installs
9091

9192
- name: Build
9293
working-directory: ${{runner.workspace}}/build
@@ -177,9 +178,10 @@ jobs:
177178
run: |
178179
cmake $GITHUB_WORKSPACE -DHIPO=ON \
179180
-DMETIS_ROOT=${{runner.workspace}}/installs \
180-
-DGKLIB_ROOT=${{runner.workspace}}/installs \
181181
-DCMAKE_BUILD_TYPE=Debug
182182
183+
# -DGKLIB_ROOT=${{runner.workspace}}/installs \
184+
183185
- name: Build
184186
working-directory: ${{runner.workspace}}/build
185187
run: |
@@ -276,8 +278,9 @@ jobs:
276278
working-directory: ${{runner.workspace}}/build
277279
run: |
278280
cmake $GITHUB_WORKSPACE -DHIPO=ON -DALL_TESTS=ON \
279-
-DMETIS_ROOT=${{runner.workspace}}/installs \
280-
-DGKLIB_ROOT=${{runner.workspace}}/installs
281+
-DMETIS_ROOT=${{runner.workspace}}/installs
282+
283+
# -DGKLIB_ROOT=${{runner.workspace}}/installs
281284

282285
- name: Build
283286
working-directory: ${{runner.workspace}}/build
@@ -368,9 +371,10 @@ jobs:
368371
run: |
369372
cmake $GITHUB_WORKSPACE -DHIPO=ON -DALL_TESTS=ON \
370373
-DMETIS_ROOT=${{runner.workspace}}/installs \
371-
-DGKLIB_ROOT=${{runner.workspace}}/installs \
372374
-DCMAKE_BUILD_TYPE=Debug
373375
376+
# -DGKLIB_ROOT=${{runner.workspace}}/installs \
377+
374378
- name: Build
375379
working-directory: ${{runner.workspace}}/build
376380
run: |

cmake/FindHipoDeps.cmake

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,20 @@ if (NOT WIN32)
5454
HINTS "${METIS_ROOT}/lib")
5555
message("Found Metis library at ${METIS_LIB}")
5656

57-
# GKlib
58-
option(GKLIB_ROOT "Root directory of GKlib" "")
59-
message(STATUS "GKLIB_ROOT is " ${GKLIB_ROOT})
57+
# # GKlib
58+
# option(GKLIB_ROOT "Root directory of GKlib" "")
59+
# message(STATUS "GKLIB_ROOT is " ${GKLIB_ROOT})
6060

61-
find_path(GKLIB_PATH
62-
NAMES "GKlib.h" REQUIRED
63-
HINTS "${GKLIB_ROOT}/include")
61+
# find_path(GKLIB_PATH
62+
# NAMES "GKlib.h" REQUIRED
63+
# HINTS "${GKLIB_ROOT}/include")
6464

65-
message("Found GKlib header at ${GKLIB_PATH}")
65+
# message("Found GKlib header at ${GKLIB_PATH}")
6666

67-
find_library(GKLIB_LIB
68-
NAMES GKlib
69-
REQUIRED
70-
HINTS "${GKLIB_ROOT}/lib")
67+
# find_library(GKLIB_LIB
68+
# NAMES GKlib
69+
# REQUIRED
70+
# HINTS "${GKLIB_ROOT}/lib")
7171

72-
message("Found GKlib library at ${GKLIB_LIB}")
72+
# message("Found GKlib library at ${GKLIB_LIB}")
7373
endif()

highs/CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,12 @@ else()
211211
# Metis
212212
target_include_directories(highs PRIVATE "${METIS_PATH}")
213213
target_link_libraries(highs "${METIS_LIB}")
214+
# target_link_directories(highs PRIVATE "${METIS_ROOT}/lib")
215+
216+
# # GKlib
217+
# target_include_directories(highs PRIVATE "${GKLIB_PATH}")
218+
# target_link_libraries(highs "${GKLIB_LIB}")
214219

215-
# GKlib
216-
target_include_directories(highs PRIVATE "${GKLIB_PATH}")
217-
target_link_libraries(highs "${GKLIB_LIB}")
218220
endif()
219221

220222
endif()

0 commit comments

Comments
 (0)