@@ -5,18 +5,32 @@ matrix:
55 include :
66 - os : linux
77 env :
8- - COMPILER=g++-5 STDLIB=libc++
8+ - COMPILER=g++-7
99 addons :
1010 apt :
11- sources : ['ubuntu-toolchain-r-test', 'george-edison55-precise-backports' ]
12- packages : ["g++-5 ", "cmake-data", "cmake"]
11+ sources : ['ubuntu-toolchain-r-test']
12+ packages : ["g++-7 ", "cmake-data", "cmake"]
1313 - os : linux
1414 env :
15- - COMPILER=g++-4.8 USE_BOOST_REGEX=ON
15+ - COMPILER=g++-8
1616 addons :
1717 apt :
18- sources : ['ubuntu-toolchain-r-test', 'george-edison55-precise-backports', 'boost-latest']
19- packages : ["g++-4.8", "cmake-data", "cmake", "libboost-regex-dev"]
18+ sources : ['ubuntu-toolchain-r-test']
19+ packages : ["g++-8", "cmake-data", "cmake"]
20+ - os : linux
21+ env :
22+ - COMPILER=g++-9
23+ addons :
24+ apt :
25+ sources : ['ubuntu-toolchain-r-test']
26+ packages : ["g++-9", "cmake-data", "cmake"]
27+ - os : linux
28+ env :
29+ - COMPILER=g++-9 USE_BOOST_REGEX=ON
30+ addons :
31+ apt :
32+ sources : ['ubuntu-toolchain-r-test']
33+ packages : ["g++-9", "cmake-data", "cmake", "libboost-regex-dev"]
2034
2135 - os : linux
2236 env :
@@ -28,11 +42,11 @@ matrix:
2842
2943 - os : linux
3044 env :
31- - COMPILER=clang++-3.7 STDLIB=libc++
45+ - COMPILER=clang++-8 STDLIB=libc++
3246 addons :
3347 apt :
34- sources : ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.7', 'george-edison55-precise-backports ']
35- packages : ["clang-3.7 ", "cmake-data", "cmake"]
48+ sources : ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-8 ']
49+ packages : ["clang-8 ", "cmake-data", "cmake"]
3650
3751 - os : osx
3852 osx_image : xcode9.4
@@ -50,19 +64,32 @@ matrix:
5064 env :
5165 - COMPILER=clang++ V='Apple LLVM 11.0'
5266 - COMPILER=clang++ V='Apple LLVM 11.0' WITH_CPP14=true
67+ - os : osx
68+ osx_image : xcode11.2
69+ env :
70+ - COMPILER=clang++ V='Apple LLVM 11.0'
71+ - COMPILER=clang++ V='Apple LLVM 11.0' WITH_CPP17=true
5372
5473before_install :
5574 - CMAKE_CXX_FLAGS+=" -Wall"
56-
57- - if [[ "${WITH_CPP14}" == "true" ]]; then CMAKE_OPTIONS+=" -DCMAKE_CXX_STANDARD=14"; fi
75+ - |
76+ if [[ "${WITH_CPP14}" == "true" ]]; then
77+ CMAKE_OPTIONS+=" -DCMAKE_CXX_STANDARD=14"
78+ fi
79+ - |
80+ if [[ "${WITH_CPP17}" == "true" ]]; then
81+ CMAKE_OPTIONS+=" -DCMAKE_CXX_STANDARD=17"
82+ fi
5883 - |
5984 if [[ "${USE_BOOST_REGEX}" == "ON" ]]; then
6085 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"
86+ CMAKE_OPTIONS+=" -DBoost_REGEX_LIBRARY_DEBUG=/usr/lib/x86_64-linux-gnu/libboost_regex.so"
87+ CMAKE_OPTIONS+=" -DBoost_REGEX_LIBRARY_RELEASE=/usr/lib/x86_64-linux-gnu/libboost_regex.so"
88+ fi
89+ - |
90+ if [[ "${STDLIB}" == "libc++" ]]; then
91+ CMAKE_CXX_FLAGS+=" -stdlib=libc++"
6392 fi
64- - if [[ "${STDLIB}" == "libc++" ]]; then CMAKE_CXX_FLAGS+=" -stdlib=libc++"; fi
65-
6693 - ${COMPILER} --version
6794
6895before_script :
0 commit comments