Travis: Define CC and CXX in yaml

.travis.yml

@@ -2,128 +2,105 @@ sudo: false
 language: cpp
 matrix:
   include:
-    - compiler: gcc
+    - addons:
-      addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-4.4']
-      env: SCRIPT=cmake GCC=4.4
+      env: SCRIPT=cmake _CC=gcc-4.4 _CXX=g++-4.4
-    - compiler: gcc
+    - addons:
-      addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-4.6']
-      env: SCRIPT=cmake GCC=4.6
+      env: SCRIPT=cmake _CC=gcc-4.6 _CXX=g++-4.6
-    - compiler: gcc
+    - addons:
-      addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-4.7']
-      env: SCRIPT=cmake GCC=4.7
+      env: SCRIPT=cmake _CC=gcc-4.7 _CXX=g++-4.7
-    - compiler: gcc
+    - addons:
-      addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-4.8']
-      env: SCRIPT=cmake GCC=4.8 SANITIZE=address
+      env: SCRIPT=cmake _CC=gcc-4.8 _CXX=g++-4.8 SANITIZE=address
-    - compiler: gcc
+    - addons:
-      addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-4.9']
-      env: SCRIPT=cmake GCC=4.9 SANITIZE=leak
+      env: SCRIPT=cmake _CC=gcc-4.9 _CXX=g++-4.9 SANITIZE=leak
-    - compiler: gcc
+    - addons:
-      addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-5']
-      env: SCRIPT=cmake GCC=5 # SANITIZE=undefined 
+      env: SCRIPT=cmake _CC=gcc-5 _CXX=g++-5 # SANITIZE=undefined 
-    - compiler: gcc
+    - addons:
-      addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-6']
-      env: SCRIPT=cmake GCC=6
+      env: SCRIPT=cmake _CC=gcc-6 _CXX=g++-6
-    - compiler: gcc
+    - addons:
-      addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-7']
-      env: SCRIPT=cmake GCC=7
+      env: SCRIPT=cmake _CC=gcc-7 _CXX=g++-7
-    - compiler: clang
+    - env: SCRIPT=cmake _CC=clang _CXX=clang++
-      env: SCRIPT=cmake
+    - addons:
-    - compiler: clang
-      addons:
         apt:
           sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5']
           packages: ['clang-3.5']
-      env: SCRIPT=cmake CLANG=3.5 SANITIZE=address
+      env: SCRIPT=cmake _CC=clang-3.5 _CXX=clang++-3.5 SANITIZE=address
-    - compiler: clang
+    - addons:
-      addons:
         apt:
           sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.6']
           packages: ['clang-3.6']
-      env: SCRIPT=cmake CLANG=3.6 SANITIZE=leak
+      env: SCRIPT=cmake _CC=clang-3.6 _CXX=clang++-3.6 SANITIZE=leak
-    - compiler: clang
+    - addons:
-      addons:
         apt:
           sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.7']
           packages: ['clang-3.7']
-      env: SCRIPT=cmake CLANG=3.7
+      env: SCRIPT=cmake _CC=clang-3.7 _CXX=clang++-3.7
-    - compiler: clang
+    - addons:
-      addons:
         apt:
           sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.8']
           packages: ['clang-3.8']
-      env: SCRIPT=cmake CLANG=3.8 SANITIZE=undefined
+      env: SCRIPT=cmake _CC=clang-3.8 _CXX=clang++-3.8 SANITIZE=undefined
-    - compiler: clang
+    - addons:
-      addons:
         apt:
           sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-3.9']
           packages: ['clang-3.9']
-      env: SCRIPT=cmake CLANG=3.9
+      env: SCRIPT=cmake _CC=clang-3.9 _CXX=clang++-3.9
-    - compiler: clang
+    - addons:
-      addons:
         apt:
           sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-4.0']
           packages: ['clang-4.0']
-      env: SCRIPT=cmake CLANG=4.0
+      env: SCRIPT=cmake _CC=clang-4.0 _CXX=clang++-4.0
-    - compiler: clang
+    - addons:
-      addons:
         apt:
           sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-5.0']
           packages: ['clang-5.0']
-      env: SCRIPT=cmake CLANG=5.0
+      env: SCRIPT=cmake _CC=clang-5.0 _CXX=clang++-5.0
-    - compiler: clang
+    - addons:
-      addons:
         apt:
           sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-6.0']
           packages: ['clang-6.0']
-      env: SCRIPT=cmake CLANG=6.0
+      env: SCRIPT=cmake _CC=clang-6.0 _CXX=clang++-6.0
-    - compiler: gcc
+    - env: SCRIPT=coverage
-      env: SCRIPT=coverage
     - os: osx
       osx_image: xcode7.3
-      compiler: clang
       env: SCRIPT=cmake
     - os: osx
       osx_image: xcode8.3
-      compiler: clang
       env: SCRIPT=cmake
     - os: osx
       osx_image: xcode9.4
-      compiler: clang
       env: SCRIPT=cmake
     - os: osx
       osx_image: xcode10
-      compiler: clang
       env: SCRIPT=cmake SANITIZE=address
     - env: SCRIPT=arduino VERSION=1.6.7 BOARD=arduino:avr:uno
     - env: SCRIPT=arduino VERSION=1.8.2 BOARD=arduino:samd:mkr1000
     - env: SCRIPT=platformio BOARD=uno
     - env: SCRIPT=platformio BOARD=esp01
-    - compiler: clang
+    - addons:
-      addons:
         apt:
           sources: ['ubuntu-toolchain-r-test','llvm-toolchain-trusty-6.0']
           packages: ['clang-6.0','llvm-6.0']

scripts/travis/cmake.sh

@@ -1,14 +1,7 @@
 #!/bin/sh -ex
 
-if [ -n "$GCC" ]; then
+export CC="$_CC"
-	export CC="gcc-$GCC"
+export CXX="$_CXX"
-	export CXX="g++-$GCC"
-fi
-
-if [ -n "$CLANG" ]; then
-	export CC="clang-$CLANG"
-	export CXX="clang++-$CLANG"
-fi
 
 if [ -n "$SANITIZE" ]; then
 	export CXXFLAGS="-fsanitize=$SANITIZE"