diff options
| author | Felix Geyer <debfx@fobos.de> | 2015-09-12 16:24:42 +0300 |
|---|---|---|
| committer | Felix Geyer <debfx@fobos.de> | 2015-09-12 16:24:42 +0300 |
| commit | eb9fdb43c1de0805b3df7fc6c0b0e44b9c7c771d (patch) | |
| tree | d484a9a2b9bd4b1fb7763fc37e48ec4adbdeb73c /.travis.yml | |
| parent | 0362f45547753f81687022b6be1dfe970c883fc1 (diff) | |
travis-ci: install and use gcc 4.7.
gcc 4.6 doesn't support all C++11 feature we need.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index b479f158e..14b8ba937 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,13 @@ compiler: language: cpp before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository -y ppa:beineri/opt-qt541; fi + - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" == "g++" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update; fi + - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CC" == "gcc" ]; then sudo apt-get -qq install gcc-4.7; fi + - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CC" == "gcc" ]; then export CC="gcc-4.7"; fi + - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" == "g++" ]; then sudo apt-get -qq install g++-4.7; fi + - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" == "g++" ]; then export CXX="g++-4.7"; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install cmake qt54base qt54x11extras qt54tools libgcrypt11-dev zlib1g-dev libxtst-dev; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew ls | grep -wq cmake || brew install cmake; fi |