Skip to content

Commit f019b9d

Browse files
committed
GKlib header back in and library path, remove shared
1 parent 1145d44 commit f019b9d

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/hipo-ubuntu.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,15 @@ jobs:
3636
- name: Install GKLIB
3737
run: |
3838
cd GKlib
39-
make config shared=1
39+
make config prefix=${{runner.workspace}}/installs
4040
make
41+
make install
4142
4243
- name: Install METIS
4344
run: |
4445
cd METIS
4546
export LD_LIBRARY_PATH=/home/runner/work/HiGHS/installs/lib:$LD_LIBRARY_PATH
46-
make config shared=1 prefix=${{runner.workspace}}/installs gklib_path=../GKlib
47+
make config prefix=${{runner.workspace}}/installs
4748
make
4849
make install
4950
@@ -119,19 +120,18 @@ jobs:
119120
- name: Install GKLIB
120121
run: |
121122
cd GKlib
122-
make config shared=1 prefix=${{runner.workspace}}/installs
123+
make config prefix=${{runner.workspace}}/installs
123124
make
124125
make install
125126
126127
- name: Install METIS
127128
run: |
128129
cd METIS
129-
make config shared=1 prefix=${{runner.workspace}}/installs gklib_path=${{runner.workspace}}/installs
130+
export LD_LIBRARY_PATH=/home/runner/work/HiGHS/installs/lib:$LD_LIBRARY_PATH
131+
make config prefix=${{runner.workspace}}/installs
130132
make
131133
make install
132134
133-
# export LD_LIBRARY_PATH=/home/runner/work/HiGHS/installs/lib:$LD_LIBRARY_PATH
134-
135135
- name: Check METIS and GKlib
136136
working-directory: ${{runner.workspace}}
137137
run: |

highs/ipm/hipo/factorhighs/Analyse.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include "DataCollector.h"
1010
#include "FactorHiGHSSettings.h"
11-
// #include "GKlib.h"
11+
#include "GKlib.h"
1212
#include "ReturnValues.h"
1313
#include "ipm/hipo/auxiliary/Auxiliary.h"
1414
#include "ipm/hipo/auxiliary/Log.h"

0 commit comments

Comments
 (0)