diff options
| -rw-r--r-- | .travis.yml | 25 | ||||
| -rw-r--r-- | Tools/travis-linux-install.sh | 3 |
2 files changed, 11 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml index a36b169b4..8de02e2b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,12 +7,10 @@ matrix: - compiler: gcc os: linux env: SWIGLANG= - - compiler: gcc - os: linux - env: SWIGLANG= GCC5=1 CPP11=1 - - compiler: gcc - os: linux - env: SWIGLANG= GCC5=1 CPP14=1 + - os: linux + env: SWIGLANG= SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1 + - os: linux + env: SWIGLANG= SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP14=1 - compiler: gcc os: linux env: SWIGLANG=csharp @@ -100,15 +98,12 @@ matrix: - compiler: gcc os: linux env: SWIGLANG=tcl - - compiler: gcc - os: linux - env: SWIGLANG=csharp GCC5=1 CPP11=1 - - compiler: gcc - os: linux - env: SWIGLANG=java GCC5=1 CPP11=1 - - compiler: gcc - os: linux - env: SWIGLANG=python GCC5=1 CPP11=1 + - os: linux + env: SWIGLANG=csharp SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1 + - os: linux + env: SWIGLANG=java SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1 + - os: linux + env: SWIGLANG=python SWIG_CC=gcc-5 SWIG_CXX=g++-5 CPP11=1 - os: osx env: SWIGLANG= SWIG_CC=gcc-4.2 SWIG_CXX=g++-4.2 - compiler: clang diff --git a/Tools/travis-linux-install.sh b/Tools/travis-linux-install.sh index 11c937677..0b5172b6d 100644 --- a/Tools/travis-linux-install.sh +++ b/Tools/travis-linux-install.sh @@ -2,12 +2,11 @@ lsb_release -a sudo apt-get -qq update -if [[ "$GCC5" ]]; then +if [[ "$CC" == gcc-5 ]]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test sudo add-apt-repository -y ppa:boost-latest/ppa sudo apt-get -qq update sudo apt-get install -qq g++-5 libboost1.55-dev - export CC=gcc-5 CXX=g++-5 else sudo apt-get -qq install libboost-dev fi |