Trying to fix travis builds

ybainier · Oct 15, 2019 · 9fb6b17 · 9fb6b17
1 parent 4832cdf
commit 9fb6b17
Showing 1 changed file with 26 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,42 +2,47 @@ sudo: required
 
 language: cpp
 
+dist: trusty
+
 os:
     - linux
     - osx
 
-compiler:
-    - gcc
-    - clang
+matrix:
+  exclude:
+    - os: osx
+      compiler: gcc
 
-addons:
-    apt:
-        sources:
+  include:
+    - compiler: gcc
+      addons:
+        apt:
+          sources:
             - ubuntu-toolchain-r-test
-        packages:
-            - g++-4.8
-            - clang
-            - cmake
+          packages:
+            - g++-5
+      env: COMPILER=g++-5
 
-
-matrix:
-    exclude:
-        - os: osx
-          compiler: gcc
+    - compiler: clang
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.8
+          packages:
+            - g++-5 # need at least gcc 5 because clang uses gcc stl
+            - clang-3.8
+      env: COMPILER=clang++-3.8
 
 before_install:
     - if [ "$TRAVIS_OS_NAME" == "linux" ]; then
         sudo apt-get install libboost-all-dev;
       fi
 
-install:
-    # g++
-    - if [ "$CXX" == "g++" ]; then export CXX="g++-4.8"; fi
-
 before_script:  
     - mkdir build
     - cd build
-    - cmake ..
+    - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release ..
 
-script:
+script:s
     - make -j 3