diff options
| author | Martin Hořeňovský | 2017-04-20 22:47:05 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2017-04-20 22:47:05 +0200 |
| commit | 417b2bcf5cfb540733ceeb40ef52093db8eccfcb (patch) | |
| tree | d824ff47baa3a0154962352e4ccc76704e1a7f27 | |
| parent | 8f0feaa6d2748fb4d4916df922473026f65db4db (diff) | |
| download | catch3-417b2bcf5cfb540733ceeb40ef52093db8eccfcb.tar.gz | |
Enable C++14 on Linux on Travis
| -rw-r--r-- | .travis.yml | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index c44a8cd7..32ef4aa6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -186,8 +186,36 @@ matrix: addons: *clang38 env: COMPILER='clang++-3.8' BUILD_TYPE='Debug' CPP11=1 + # 4a/ Linux C++14 GCC builds + - os: linux + compiler: gcc + addons: &gcc6 + apt: + sources: ['ubuntu-toolchain-r-test'] + packages: ['g++-6'] + env: COMPILER='g++-6' BUILD_TYPE='Release' CPP14=1 + + - os: linux + compiler: gcc + addons: *gcc6 + env: COMPILER='g++-6' BUILD_TYPE='Debug' CPP14=1 + + # 4b/ Linux C++14 Clang builds + - os: linux + compiler: clang + addons: &clang38 + apt: + sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test'] + packages: ['clang-3.8'] + env: COMPILER='clang++-3.8' BUILD_TYPE='Release' CPP14=1 + + - os: linux + compiler: clang + addons: *clang38 + env: COMPILER='clang++-3.8' BUILD_TYPE='Debug' CPP14=1 + - # 4/ OSX Clang Builds + # 5/ OSX Clang Builds - os: osx osx_image: xcode7.3 compiler: clang @@ -224,7 +252,7 @@ install: before_script: - export CXX=${COMPILER} - cd ${TRAVIS_BUILD_DIR} - - cmake -H. -BBuild -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -Wdev -DUSE_CPP11=${CPP11} + - cmake -H. -BBuild -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -Wdev -DUSE_CPP11=${CPP11} -DUSE_CPP14=${CPP14} - cd Build script: |