Commit e1a071480c7098000c1965e22019fab756fe407c

Authored by Jarryd Beck
1 parent 5ac2dcc5

improve build

Showing 1 changed file with 5 additions and 4 deletions
.travis.yml
@@ -6,7 +6,7 @@ os: @@ -6,7 +6,7 @@ os:
6 matrix: 6 matrix:
7 include: 7 include:
8 - os: linux 8 - os: linux
9 - env: COMPILER_NAME=gcc CXX=g++-5 CC=gcc-5 9 + env: COMPILER=g++-5
10 addons: 10 addons:
11 apt: 11 apt:
12 packages: 12 packages:
@@ -15,11 +15,12 @@ matrix: @@ -15,11 +15,12 @@ matrix:
15 - llvm-toolchain-precise-3.8 15 - llvm-toolchain-precise-3.8
16 - ubuntu-toolchain-r-test 16 - ubuntu-toolchain-r-test
17 - os: linux 17 - os: linux
18 - env: COMPILER_NAME=clang CXX=clang++-3.8 CC=clang-3.8 18 + env: COMPILER=clang++-3.8
19 addons: 19 addons:
20 apt: 20 apt:
21 packages: 21 packages:
22 - clang-3.8 22 - clang-3.8
23 sources: *sources 23 sources: *sources
24 -script: cmake -DCXXOPTS_BUILD_TESTS=ON -DCMAKE_CXX_COMPILER=$COMPILER_NAME \  
25 - . && make && make ARGS=--output-on-failure test 24 +script:
  25 + | cmake -DCXXOPTS_BUILD_TESTS=ON -DCMAKE_CXX_COMPILER=$COMPILER . \
  26 + && make && make ARGS=--output-on-failure test