Update Travis CI configuration for C++11

hluk · Feb 7, 2017 · cef1f7d · cef1f7d
1 parent 2e582b4
commit cef1f7d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,17 +1,30 @@
-os:
-  - linux
-  - osx
-
 language: cpp
 
-compiler:
-  - gcc
-  - clang
-
 matrix:
-  exclude:
+  include:
     - os: osx
+      compiler: clang
+
+    - os: linux
       compiler: gcc
+      env: COMPILER=g++-4.8
+      addons:
+        apt:
+          sources:
+          - ubuntu-toolchain-r-test
+          packages:
+          - g++-4.8
+
+    - os: linux
+      compiler: clang
+      env: COMPILER=clang++-3.6
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.6
+          packages:
+            - clang-3.6
 
 cache:
     apt: true

diff --git a/utils/build-linux.sh b/utils/build-linux.sh
@@ -10,9 +10,9 @@ cd build
 # Configure.
 if [ "$CC" == "gcc" ]; then
     # GCC build generates coverage.
-    cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS=--coverage -DCMAKE_C_FLAGS=--coverage ..
+    cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_CXX_FLAGS=--coverage -DCMAKE_C_FLAGS=--coverage ..
 else
-    qmake QMAKE_CXX=clang++ CONFIG+=debug ..
+    qmake CONFIG+=debug QMAKE_CXX=$COMPILER QMAKE_CXXFLAGS="-std=c++11" ..
 fi
 
 # Build.