diff --git a/.travis.yml b/.travis.yml index 79980a4..4dda21b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,37 +1,22 @@ -# Use new trusty images, should yield newer compilers and packages -sudo: required -dist: precise language: cpp branches: only: - master - develop - - feature-travis - -matrix: - include: - - compiler: gcc - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.9 - env: COMPILER=g++-4.9 - - compiler: clang - addons: - apt: - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.7 - packages: - - clang-3.7 - env: COMPILER=clang++-3.7 + - feature-travis +compiler: + - clang + - gcc - before_install: - - sudo apt-get update - - sudo apt-get install build-essential +before_install: + # g++4.8.1 + - if [ "$CXX" == "g++" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi + + # clang 3.4 + - if [ "$CXX" == "clang++" ]; then sudo add-apt-repository -y ppa:h-rayflood/llvm; fi + + - sudo apt-get update -qq install: - sudo apt-get install git libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev @@ -49,6 +34,7 @@ before_script: - cd ../.. script: + - $CXX --version - mkdir build - cd build - cmake -D CMAKE_BUILD_TYPE=RELEASE ..