Peter M. Groen / openhantek

Commit 5de9f0438c504c9da81dc3e7bd8fa9ff9068ec0c

Authored by David Gräff
1 parent 83f6a045

Travis: Sort dependencies, change build matrix. We build with clang on osx only … 

…and don't mess with the CC environment variables anymore.
Add gtest dependency for a later unit test system.
Incorporated changes from David Röthlisberger
Inline Side-by-side
Showing 1 changed file with 29 additions and 23 deletions
.travis.yml
  View file @5de9f04
@@ -3,13 +3,9 @@ language: cpp @@ -3,13 +3,9 @@ language: cpp
3 sudo: required 3 sudo: required
4 dist: trusty 4 dist: trusty
5 5
6 -compiler:  
7 - - gcc  
8 - - clang  
9 -  
10 -os:  
11 - - osx  
12 - - linux 6 +env:
  7 + global:
  8 + - GTEST_DIR=${TRAVIS_BUILD_DIR}/gtest
13 9
14 addons: 10 addons:
15 apt: 11 apt:
@@ -18,36 +14,46 @@ addons: @@ -18,36 +14,46 @@ addons:
18 - llvm-toolchain-trusty-3.6 14 - llvm-toolchain-trusty-3.6
19 packages: &native_deps 15 packages: &native_deps
20 - cmake 16 - cmake
21 - - qttools5-dev  
22 - - qttools5-dev-tools 17 + - doxygen
  18 + - clang-3.6
23 - libusb-1.0-0-dev 19 - libusb-1.0-0-dev
24 - libfftw3-dev 20 - libfftw3-dev
25 - libqt5qml5 21 - libqt5qml5
26 - - doxygen 22 + - libgtest-dev
  23 + - libqt5opengl5-dev
  24 + - qtbase5-dev
  25 + - qttools5-dev
  26 + - qttools5-dev-tools
27 - gcc-5 27 - gcc-5
28 - g++-5 28 - g++-5
29 - - clang-3.6 29 + - gcc-4.8
  30 + - g++-4.8
30 31
31 -# We construct a build matrix for two operating systems (linux, osx) and two compilers (gcc, clang) 32 +# We are testing
  33 +# * linux with g++4.8 and g++5 and clang 3.6
  34 +# * osx with clang 3.6
32 matrix: 35 matrix:
33 - exclude:  
34 - - os: osx  
35 - compiler:  
36 - - gcc  
37 -# fast_finish: true  
38 - allow_failures:  
39 - - os: osx 36 + include:
  37 + - compiler: gcc
  38 + env: CMAKE_CXX_COMPILER=g++-4.8
  39 + os: linux
  40 + - compiler: gcc
  41 + env: CMAKE_CXX_COMPILER=g++-5
  42 + os: linux
  43 + - compiler: clang
  44 + env: CMAKE_CXX_COMPILER=clang++-3.6
  45 + os: linux
  46 + - compiler: clang
  47 + env: CMAKE_CXX_COMPILER=clang++-3.6
  48 + os: osx
40 49
41 before_install: 50 before_install:
42 - - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then sudo apt-get install -qq libqt5opengl5-dev; fi  
43 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install libusb fftw qt5; fi 51 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install libusb fftw qt5; fi
44 52
45 before_script: 53 before_script:
46 - - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CC" == "gcc" ]]; then export CXX="g++-5" CC="gcc-5"; fi  
47 - - if [[ "$TRAVIS_OS_NAME" == "linux" && "$CC" == "clang" ]]; then export CXX="clang++-3.6" CC="clang-3.6"; fi  
48 - mkdir build 54 - mkdir build
49 - cd build 55 - cd build
50 - - cmake ../ 56 + - cmake -DCMAKE_CXX_COMPILER=$CMAKE_CXX_COMPILER ../
51 57
52 script: 58 script:
53 - make 59 - make