Peter M. Groen / openhantek

Commit 04056660436c274fda3280ed31a52b3df7461492

Authored by David Graeff
Committed by David Gräff
1 parent f3ea2602

Travis: Use cmake of the updated travis ubuntu distribution. Use newer Qt from a ppa

Inline Side-by-side
Showing 1 changed file with 10 additions and 7 deletions
.travis.yml
  View file @0405666
@@ -11,17 +11,17 @@ addons: @@ -11,17 +11,17 @@ addons:
11 apt: 11 apt:
12 sources: 12 sources:
13 - ubuntu-toolchain-r-test 13 - ubuntu-toolchain-r-test
14 - - llvm-toolchain-trusty-3.6 14 + - llvm-toolchain-trusty-3.9
15 packages: &native_deps 15 packages: &native_deps
16 - cmake 16 - cmake
17 - libusb-1.0-0-dev 17 - libusb-1.0-0-dev
18 - libfftw3-dev 18 - libfftw3-dev
19 - - libqt5qml5 19 +# - libqt5qml5
20 - libgtest-dev 20 - libgtest-dev
21 - - libqt5opengl5-dev  
22 - - qtbase5-dev  
23 - - qttools5-dev  
24 - - qttools5-dev-tools 21 +# - libqt5opengl5-dev
  22 +# - qtbase5-dev
  23 +# - qttools5-dev
  24 +# - qttools5-dev-tools
25 - gcc-5 25 - gcc-5
26 - g++-5 26 - g++-5
27 # - doxygen 27 # - doxygen
@@ -44,9 +44,12 @@ matrix: @@ -44,9 +44,12 @@ matrix:
44 44
45 before_install: 45 before_install:
46 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install libusb fftw qt5; export CMAKE_PREFIX_PATH=$(brew --prefix qt5); fi 46 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install libusb fftw qt5; export CMAKE_PREFIX_PATH=$(brew --prefix qt5); fi
47 - - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then mkdir $HOME/usr; export PATH="$HOME/usr/bin:$PATH"; wget https://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.sh; chmod +x cmake-3.7.2-Linux-x86_64.sh; ./cmake-3.7.2-Linux-x86_64.sh --prefix=$HOME/usr --exclude-subdir --skip-license; fi 47 + - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then sudo add-apt-repository ppa:beineri/opt-qt551-trusty;sudo apt-get -qq update; sudo apt-get --yes install qt55base; fi
48 48
49 before_script: 49 before_script:
  50 + - QTDIR="/opt/qt55"
  51 + - PATH="$QTDIR/bin:$PATH"
  52 + - source /opt/qt55/bin/qt55-env.sh
50 - mkdir build 53 - mkdir build
51 - cd build 54 - cd build
52 - cmake -DCMAKE_CXX_COMPILER=$CMAKE_CXX_COMPILER -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH ../ 55 - cmake -DCMAKE_CXX_COMPILER=$CMAKE_CXX_COMPILER -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH ../