CMAKE_CXX_COMPILER

bblanchon · Feb 16, 2016 · 13f3c58 · 13f3c58
1 parent 8d1cd59
commit 13f3c58
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,57 +7,57 @@ matrix:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-4.4']
-      env: SCRIPT=cmake CXX=g++-4.4
+      env: SCRIPT=cmake CMAKE_CXX_COMPILER=g++-4.4
     - compiler: gcc
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-4.5']
-      env: SCRIPT=cmake CXX=g++-4.5
+      env: SCRIPT=cmake CMAKE_CXX_COMPILER=g++-4.5
     - compiler: gcc
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-4.6']
-      env: SCRIPT=cmake CXX=g++-4.6
+      env: SCRIPT=cmake CMAKE_CXX_COMPILER=g++-4.6
     - compiler: gcc
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-4.7']
-      env: SCRIPT=cmake CXX=g++-4.7
+      env: SCRIPT=cmake CMAKE_CXX_COMPILER=g++-4.7
     - compiler: gcc
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-4.8']
-      env: SCRIPT=cmake CXX=g++-4.8
+      env: SCRIPT=cmake CMAKE_CXX_COMPILER=g++-4.8
     - compiler: gcc
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-4.9']
-      env: SCRIPT=cmake CXX=g++-4.9
+      env: SCRIPT=cmake CMAKE_CXX_COMPILER=g++-4.9
     - compiler: gcc
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['g++-5']
-      env: SCRIPT=cmake CXX=g++-5
+      env: SCRIPT=cmake CMAKE_CXX_COMPILER=g++-5
     - compiler: clang
       env: SCRIPT=cmake
     - compiler: clang
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5']
           packages: ['clang-3.5']
-      env: SCRIPT=cmake CXX=clang++-3.5
+      env: SCRIPT=cmake CMAKE_CXX_COMPILER=clang++-3.5
     - compiler: clang
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6']
           packages: ['clang-3.6']
-      env: SCRIPT=cmake CXX=clang++-3.6
+      env: SCRIPT=cmake CMAKE_CXX_COMPILER=clang++-3.6
     - compiler: gcc
       env: SCRIPT=coverage
     - env: SCRIPT=arduino VERSION=1.5.8 BOARD=arduino:avr:uno

diff --git a/scripts/travis/cmake.sh b/scripts/travis/cmake.sh
@@ -2,6 +2,6 @@
 
 curl -sS https://cmake.org/files/v3.4/cmake-3.4.0-Linux-x86_64.tar.gz | tar xz -C /tmp --strip 1
 
-/tmp/bin/cmake .
+/tmp/bin/cmake -DCMAKE_CXX_COMPILER=$CMAKE_CXX_COMPILER .
 make 
 make test