From c88fb1cc9f089aff4b9f640bdef43062f19fc071 Mon Sep 17 00:00:00 2001 From: chenguoping Date: Sat, 4 Jul 2020 17:42:33 +0800 Subject: [PATCH] add travis task : compile and test under C++17 --- .travis.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0fef3f44b..b90757349 100644 --- a/.travis.yml +++ b/.travis.yml @@ -218,6 +218,17 @@ matrix: sources: ['ubuntu-toolchain-r-test'] packages: ['g++-9', 'ninja-build'] + - os: linux + compiler: gcc + env: + - COMPILER=g++-9 + - CXXFLAGS=-std=c++17 + - CMAKE_CXX_STANDARD=17 + addons: + apt: + sources: ['ubuntu-toolchain-r-test'] + packages: ['g++-9', 'ninja-build'] + # Linux / Clang - os: linux @@ -323,7 +334,11 @@ script: # compile and execute unit tests - mkdir -p build && cd build - - cmake .. ${CMAKE_OPTIONS} -DJSON_MultipleHeaders=${MULTIPLE_HEADERS} -DJSON_BuildTests=On -GNinja && cmake --build . --config Release + - if [[ "${CMAKE_CXX_STANDARD}" != "" ]]; then + cmake .. ${CMAKE_OPTIONS} -DJSON_MultipleHeaders=${MULTIPLE_HEADERS} -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} -DJSON_BuildTests=On -GNinja && cmake --build . --config Release ; + else + cmake .. ${CMAKE_OPTIONS} -DJSON_MultipleHeaders=${MULTIPLE_HEADERS} -DJSON_BuildTests=On -GNinja && cmake --build . --config Release ; + fi - ctest -C Release --timeout 2700 -V -j - cd ..