From: Daniel Albers <daniel@lbe.rs>
Date: Mon, 28 Jul 2014 14:29:37 +0000 (+0200)
Subject: Travis: Update gcc to 4.7
X-Git-Tag: 0.11.0~20
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=588c5e4a035f11bcb934d64813603ffdc8d270ed

Travis: Update gcc to 4.7

Fixes Travis builds currently failing with:
  cc1plus: error: unrecognized command line option ‘-std=c++11’
---

diff --git a/.travis.yml b/.travis.yml
index 3eac5a59..b99c62bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,12 @@ compiler:
   - clang
 
 before_install:
- - echo "yes" | sudo add-apt-repository ppa:kalakris/cmake
+ - sudo add-apt-repository ppa:kalakris/cmake/test -y
  - sudo apt-get update -qq
  - sudo apt-get install cmake
+ - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+ - sudo apt-get update -qq
+ - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.7; fi
+ - if [ "$CXX" = "g++" ]; then export CXX="g++-4.7" CC="gcc-4.7"; fi
 
 script: mkdir build && cd build && cmake ../ && make