Peter M. Groen / CLI11

Commit a80ac7b7502d3a255fbfc5c33da1c6da53db0ba6

Authored by Henry Fredrick Schreiner
1 parent a99b6a33

Trying to set CC and CXX

Inline Side-by-side
Showing 1 changed file with 3 additions and 6 deletions
.travis.yml
  View file @a80ac7b
@@ -14,9 +14,7 @@ matrix: @@ -14,9 +14,7 @@ matrix:
14 - ubuntu-toolchain-r-test 14 - ubuntu-toolchain-r-test
15 packages: 15 packages:
16 - g++-4.9 16 - g++-4.9
17 - env:  
18 - - CC=gcc-4.8  
19 - - CXX=g++-4.8 17 + env: COMPILER=4.9
20 - compiler: gcc 18 - compiler: gcc
21 addons: 19 addons:
22 apt: 20 apt:
@@ -24,9 +22,7 @@ matrix: @@ -24,9 +22,7 @@ matrix:
24 - ubuntu-toolchain-r-test 22 - ubuntu-toolchain-r-test
25 packages: 23 packages:
26 - g++-4.8 24 - g++-4.8
27 - env:  
28 - - CC=gcc-4.8  
29 - - CXX=g++-4.8 25 + env: COMPILER=4.8
30 - compiler: clang 26 - compiler: clang
31 addons: 27 addons:
32 apt: 28 apt:
@@ -37,6 +33,7 @@ matrix: @@ -37,6 +33,7 @@ matrix:
37 - clang-3.6 33 - clang-3.6
38 34
39 install: 35 install:
  36 + - if [ "$CXX" = "g++" ]; then export CXX="g++-$COMPILER" CC="gcc-$COMPILER"; fi
40 - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps" 37 - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
41 - CMAKE_URL="https://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz" 38 - CMAKE_URL="https://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz"
42 - cd "${DEPS_DIR}" 39 - cd "${DEPS_DIR}"