Skip to content

Commit bf1d121

Browse files
committed
Enable gcc-48 testing with travis
1 parent 8e45a51 commit bf1d121

File tree

1 file changed

+18
-5
lines changed

1 file changed

+18
-5
lines changed

.travis.yml

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,24 @@ matrix:
1010
apt:
1111
sources: ['ubuntu-toolchain-r-test', 'george-edison55-precise-backports']
1212
packages: ["g++-5", "cmake-data", "cmake"]
13+
- os: linux
14+
env:
15+
- COMPILER=g++-4.8 USE_BOOST_REGEX=ON
16+
addons:
17+
apt:
18+
sources: ['ubuntu-toolchain-r-test', 'george-edison55-precise-backports', 'boost-latest']
19+
packages: ["g++-4.8", "cmake-data", "cmake", "libboost-regex1.55-dev"]
1320

1421
- os: linux
15-
env:
22+
env:
1623
- COMPILER=clang++-3.6 STDLIB=libc++
1724
addons:
1825
apt:
1926
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6', 'george-edison55-precise-backports']
2027
packages: ["clang-3.6", "cmake-data", "cmake"]
2128

2229
- os: linux
23-
env:
30+
env:
2431
- COMPILER=clang++-3.7 STDLIB=libc++
2532
addons:
2633
apt:
@@ -29,13 +36,13 @@ matrix:
2936

3037
- os: osx
3138
osx_image: xcode6.4
32-
env:
39+
env:
3340
- COMPILER=clang++ V='Apple LLVM 6.4'
3441
- COMPILER=clang++ V='Apple LLVM 6.4' WITH_CPP14=true
3542

3643
- os: osx
3744
osx_image: xcode7
38-
env:
45+
env:
3946
- COMPILER=clang++ V='Apple LLVM 7.0'
4047
- COMPILER=clang++ V='Apple LLVM 7.0' WITH_CPP14=true
4148

@@ -48,6 +55,12 @@ before_install:
4855
- CMAKE_CXX_FLAGS+=" -Wall"
4956

5057
- if [[ "${WITH_CPP14}" == "true" ]]; then CMAKE_OPTIONS+=" -DCMAKE_CXX_STANDARD=14"; fi
58+
- |
59+
if [[ "${USE_BOOST_REGEX}" == "ON" ]]; then
60+
CMAKE_OPTIONS+=" -DUSE_BOOST_REGEX=ON"
61+
CMAKE_OPTIONS+=" -DBoost_REGEX_LIBRARY_DEBUG=/usr/lib/x86_64-linux-gnu/libboost_regex.so.1.55.0"
62+
CMAKE_OPTIONS+=" -DBoost_REGEX_LIBRARY_RELEASE=/usr/lib/x86_64-linux-gnu/libboost_regex.so.1.55.0"
63+
fi
5164
- if [[ "${STDLIB}" == "libc++" ]]; then CMAKE_CXX_FLAGS+=" -stdlib=libc++"; fi
5265

5366
- sh ${COMPILER} --version || true
@@ -58,6 +71,6 @@ before_script:
5871
- cd build
5972
- cmake -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DWITH_TESTS=1 -DWITH_EXAMPLE=1 ${CMAKE_OPTIONS} ..
6073

61-
script:
74+
script:
6275
- cmake --build .
6376
- python run_tests

0 commit comments

Comments
 (0)