External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix C++ standard requirements for travis

Browse Source
This commit is contained in:
Alexander Karzhenkov 2020-08-21 09:40:21 +05:00
parent df5943da52
commit 1943399433
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -23,7 +23,7 @@ matrix:
compiler: gcc compiler: gcc
env: env:
- COMPILER=g++-9 - COMPILER=g++-9
- CXXFLAGS=-std=c++2a - CXX_STANDARD=17
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test'] sources: ['ubuntu-toolchain-r-test']
@ -35,7 +35,7 @@ matrix:
compiler: clang compiler: clang
env: env:
- COMPILER=clang++-7 - COMPILER=clang++-7
- CXXFLAGS=-std=c++1z - CXX_STANDARD=17
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-7'] sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-7']
@ -62,13 +62,16 @@ script:
# by default, use implicit conversions # by default, use implicit conversions
- if [[ "${IMPLICIT_CONVERSIONS}" == "" ]]; then export IMPLICIT_CONVERSIONS=ON; fi - if [[ "${IMPLICIT_CONVERSIONS}" == "" ]]; then export IMPLICIT_CONVERSIONS=ON; fi
# append CXX_STANDARD to CMAKE_OPTIONS if required
- CMAKE_OPTIONS+=${CXX_STANDARD:+ -DCMAKE_CXX_STANDARD=$CXX_STANDARD -DCMAKE_CXX_STANDARD_REQUIRED=ON}
# force verbose build # force verbose build
- CMAKE_OPTIONS+=" -DCMAKE_VERBOSE_MAKEFILE=ON" - CMAKE_OPTIONS+=" -DCMAKE_VERBOSE_MAKEFILE=ON"
# compile and execute unit tests # compile and execute unit tests
- mkdir -p build && cd build - mkdir -p build && cd build
- cmake .. ${CMAKE_OPTIONS} -DJSON_MultipleHeaders=${MULTIPLE_HEADERS} -DJSON_ImplicitConversions=${IMPLICIT_CONVERSIONS} -DJSON_BuildTests=On -GNinja && cmake --build . --config Release --target test-conversions - cmake .. ${CMAKE_OPTIONS} -DJSON_MultipleHeaders=${MULTIPLE_HEADERS} -DJSON_ImplicitConversions=${IMPLICIT_CONVERSIONS} -DJSON_BuildTests=On -GNinja && cmake --build . --config Release --target test-conversions
- ctest -C Release --timeout 2700 -V -R test-conversions -j - ctest -C Release --timeout 2700 -V -R test-conversions -j
- cd .. - cd ..
# check if homebrew works (only checks develop branch) # check if homebrew works (only checks develop branch)