mirror of
https://github.com/Lizonghang/prima.cpp.git
synced 2025-09-07 18:29:02 +00:00
fix option USE_HIGHS
This commit is contained in:
parent
18c96e8042
commit
dab6b2e1c2
1 changed files with 10 additions and 9 deletions
19
Makefile
19
Makefile
|
@ -271,19 +271,20 @@ else ifeq ($(UNAME_S),Linux)
|
||||||
MK_LDFLAGS += -L/usr/local/lib -lzmq
|
MK_LDFLAGS += -L/usr/local/lib -lzmq
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef USE_HIGHS
|
ifeq ($(USE_HIGHS),1)
|
||||||
ifeq ($(UNAME_S),Darwin)
|
ifeq ($(UNAME_S),Darwin)
|
||||||
MK_CPPFLAGS += -isystem /opt/homebrew/include/highs
|
HIGHS_CPPFLAGS = -isystem /opt/homebrew/include/highs
|
||||||
MK_LDFLAGS += -L/opt/homebrew/lib -lhighs
|
HIGHS_LDFLAGS = -L/opt/homebrew/lib -lhighs
|
||||||
else ifeq ($(UNAME_S),Linux)
|
else ifeq ($(UNAME_S),Linux)
|
||||||
MK_CPPFLAGS += -isystem /usr/local/include/highs
|
HIGHS_CPPFLAGS = -isystem /usr/local/include/highs
|
||||||
MK_LDFLAGS += -L/usr/local/lib -lhighs
|
HIGHS_LDFLAGS = -L/usr/local/lib -lhighs
|
||||||
|
|
||||||
ifneq ($(CONDA_PREFIX),)
|
ifneq ($(CONDA_PREFIX),)
|
||||||
MK_CPPFLAGS += -isystem $(CONDA_PREFIX)/include -isystem $(CONDA_PREFIX)/include/highs
|
HIGHS_CPPFLAGS += -isystem $(CONDA_PREFIX)/include -isystem $(CONDA_PREFIX)/include/highs
|
||||||
MK_LDFLAGS += -L$(CONDA_PREFIX)/lib -Wl,-rpath,$(CONDA_PREFIX)/lib
|
HIGHS_LDFLAGS += -L$(CONDA_PREFIX)/lib -Wl,-rpath,$(CONDA_PREFIX)/lib
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
MK_CPPFLAGS += $(HIGHS_CPPFLAGS) -DUSE_HIGHS
|
||||||
|
MK_LDFLAGS += $(HIGHS_LDFLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef LLAMA_NO_CCACHE
|
ifdef LLAMA_NO_CCACHE
|
||||||
|
|
Loading…
Add table
Reference in a new issue