summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml15
1 files changed, 9 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 11cb48b..7e36ee8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,13 +3,15 @@ language: c++
matrix:
include:
# Clang on OSX
- - env: MATRIX_EVAL="CC=clang CXX=clang++" CONF=
+ # Sadly, OutputUHD still needs clock_gettime() even if UHD is available
+ # in homebrew
+ - env: MATRIX_EVAL="" CONF="--disable-output-uhd"
os: osx
osx_image: xcode9.1
compiler: clang
# GCC and clang builds on Linux
- - env: MATRIX_EVAL="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,15 +31,16 @@ matrix:
# libuhd-dev is not allowed
- g++-6
- - env: MATRIX_EVAL="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: MATRIX_EVAL="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: MATRIX_EVAL="CC=clang-5.0 CXX=clang++-5.0" CONF=--disable-output-uhd
+ # Travis sets CC and CXX accordingly
+ - env: MATRIX_EVAL="" CONF="--disable-output-uhd"
compiler: clang
addons: &linuxclang50
apt:
@@ -57,7 +60,7 @@ matrix:
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
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install fftw boost zeromq automake curl; fi
script:
- |