diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-12-15 10:30:41 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-12-15 10:30:41 +0100 |
| commit | 91c9ed812f77f5691d96f76c67eadd28557aeb6c (patch) | |
| tree | d3a93c391a1aa398e56c0a87784ec370385aa3fc | |
| parent | 81fefc486ceb864a8eaf05e5f78587f3fb351bfe (diff) | |
| download | dabmod-91c9ed812f77f5691d96f76c67eadd28557aeb6c.tar.gz dabmod-91c9ed812f77f5691d96f76c67eadd28557aeb6c.tar.bz2 dabmod-91c9ed812f77f5691d96f76c67eadd28557aeb6c.zip | |
Set CC and CXX in Travis CI matrix properly
| -rw-r--r-- | .travis.yml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 35a8365..11cb48b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,13 +3,13 @@ language: c++ matrix: include: # Clang on OSX - - env: CC=clang CXX=clang++ CONF= + - env: MATRIX_EVAL="CC=clang CXX=clang++" CONF= os: osx osx_image: xcode9.1 compiler: clang # GCC and clang builds on Linux - - env: CC=gcc-6 CXX=g++-6 CONF=--disable-zeromq --disable-output-uhd + - env: MATRIX_EVAL="CC=gcc-6 CXX=g++-6" CONF=--disable-zeromq --disable-output-uhd os: linux dist: trusty sudo: required @@ -29,21 +29,20 @@ matrix: # libuhd-dev is not allowed - g++-6 - - env: CC=gcc-6 CXX=g++-6 CONF=--disable-output-uhd --enable-output-raw + - env: MATRIX_EVAL="CC=gcc-6 CXX=g++-6" CONF=--disable-output-uhd --enable-output-raw compiler: gcc addons: *linuxaddons - - env: CC=gcc-6 CXX=g++-6 CONF=--disable-output-uhd --disable-native + - env: MATRIX_EVAL="CC=gcc-6 CXX=g++-6" CONF=--disable-output-uhd --disable-native compiler: gcc addons: *linuxaddons - - env: CC=clang-4.0 CXX=clang++-4.0 CONF=--disable-output-uhd + - env: MATRIX_EVAL="CC=clang-5.0 CXX=clang++-5.0" CONF=--disable-output-uhd compiler: clang - addons: &linuxclang40 + addons: &linuxclang50 apt: sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-4.0 + - llvm-toolchain-trusty-5.0 packages: - libzmq3-dev - libzmq3 @@ -53,9 +52,10 @@ matrix: - libcurl4-openssl-dev - libfftw3-dev # libuhd-dev is not allowed - - clang-4.0 + - clang-5.0 before_install: + - eval "${MATRIX_EVAL}" - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install fftw boost zeromq automake curl uhd ; fi |