diff options
| author | Pjotr Prins | 2018-09-18 11:18:46 +0000 |
|---|---|---|
| committer | Pjotr Prins | 2018-09-18 11:18:46 +0000 |
| commit | a1cae02bc62500bd50693e2cc90c3b97c3dcce13 (patch) | |
| tree | c26b62ef442b0f36b91c8acbd6fa1632c6cfcec8 | |
| parent | 7c89b141975d4aa0ef29e99508c45652864efc38 (diff) | |
| download | pangemma-a1cae02bc62500bd50693e2cc90c3b97c3dcce13.tar.gz | |
Fix Travis build again
| -rw-r--r-- | Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile b/Makefile index 0ee34eb..4214dfb 100644 --- a/Makefile +++ b/Makefile @@ -79,8 +79,9 @@ ifeq ($(SYS), WIN) EIGEN_INCLUDE_PATH = ../eigen-git-mirror OPENBLAS_INCLUDE_PATH = ../OpenBLAS-v0.2.19-Win64-int32/include -L../OpenBLAS-v0.2.19-Win64-int32/lib else - # used by Travis: - OPENBLAS_INCLUDE_PATH = /usr/local/opt/openblas/include + ifdef TRAVIS_CI + OPENBLAS_INCLUDE_PATH = /usr/local/opt/openblas/include + endif ifeq ($(SYS), MAC) EIGEN_INCLUDE_PATH = /usr/local/include/eigen3 else @@ -172,6 +173,7 @@ else endif endif + .PHONY: all OUTPUT = $(BIN_DIR)/gemma @@ -188,6 +190,9 @@ LIBS_MAC_D_LAPACK = -framework Accelerate ifdef WITH_LAPACK ifeq ($(SYS), MAC) LIBS += $(LIBS_MAC_D_LAPACK) + ifdef WITH_OPENBLAS + LIBS += -Wl,-L/usr/local/opt/openblas/lib + endif else ifndef FORCE_STATIC ifdef WITH_OPENBLAS |