Skip to content

Commit

Permalink
Fixes OSX build on Travis-CI
Browse files Browse the repository at this point in the history
Fixes #160
  • Loading branch information
pjotrp committed Sep 29, 2020
1 parent ac67a05 commit 5571631
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 3 deletions.
16 changes: 15 additions & 1 deletion .travis.yml
Expand Up @@ -10,9 +10,23 @@ matrix:
packages:
- libgsl-dev
- libopenblas-dev
- os: linux
compiler: clang
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- libgsl-dev
- libopenblas-dev
- os: osx
compiler: clang
script:
- echo $MATRIX_EVAL
- eval "${MATRIX_EVAL}"
- $CXX --version
- make -j 4 OPENBLAS_LEGACY=1
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gsl ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then OPENBLAS="$(brew --prefix openblas)" ; fi
- echo $OPENBLAS
- make -j 4 CXX=$CXX WITH_OPENBLAS=1 OPENBLAS_LEGACY=1
- make OPENBLAS_LEGACY=1 fast-check
7 changes: 6 additions & 1 deletion Makefile
Expand Up @@ -111,7 +111,7 @@ else
endif

ifeq ($(CPP), clang++)
GCC_FLAGS=-std=c++11 -isystem$(OPENBLAS_INCLUDE_PATH)
GCC_FLAGS=-std=c++11 -isystem$(OPENBLAS_INCLUDE_PATH)
ifdef GUIX
CPPFLAGS += -I$(GUIX)/include/c++ -I$(GUIX)/include/c++/x86_64-unknown-linux-gnu
endif
Expand Down Expand Up @@ -158,6 +158,11 @@ static: CPPFLAGS += -static
LIBS += -lgsl -lz
ifdef WITH_OPENBLAS
LIBS += -lopenblas
ifeq ($(SYS), OSX)
ifdef WITH_OPENBLAS
LIBS += -Wl,-L/usr/local/opt/openblas/lib
endif
endif
else
LIBS += -latlas -lcblas -llapack -lblas
endif
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -253,7 +253,7 @@ program and the contents of the .log.txt file in the output directory.

### Check list:

1. [X] I have found and issue with GEMMA
1. [X] I have found an issue with GEMMA
2. [ ] I have searched for it on the [issue tracker](https://github.com/genetics-statistics/GEMMA/issues?q=is%3Aissue) (incl. closed issues)
3. [ ] I have searched for it on the [mailing list](https://groups.google.com/forum/#!forum/gemma-discussion)
4. [ ] I have tried the latest [release](https://github.com/genetics-statistics/GEMMA/releases) of GEMMA
Expand Down
3 changes: 3 additions & 0 deletions RELEASE-NOTES.md
Expand Up @@ -6,6 +6,9 @@ and

## ChangeLog v0.98.3 (2020/?)

* Fix Travis build with gcc 5.5 (OpenBLAS related round-offs)
* Fix Travis build on OSX (brew related)
* GEMMA installs on FreeBSD (thanks @outpaddling)

## ChangeLog v0.98.2 (2019/05/28)

Expand Down

0 comments on commit 5571631

Please sign in to comment.