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

rename CMAKECXXSTANDARD by CMAKE_CXX_STANDARD

Browse Source
This commit is contained in:
chenguoping 2020-06-28 09:26:33 +08:00
parent e0f6c96c19
commit 7df758f41f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -223,7 +223,7 @@ matrix:
env: env:
- COMPILER=g++-9 - COMPILER=g++-9
- CXXFLAGS=-std=c++17 - CXXFLAGS=-std=c++17
- CMAKECXXSTANDARD=17 - CMAKE_CXX_STANDARD=17
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test'] sources: ['ubuntu-toolchain-r-test']
@ -339,8 +339,8 @@ script:
# compile and execute unit tests # compile and execute unit tests
- mkdir -p build && cd build - mkdir -p build && cd build
- if [[ "${CMAKECXXSTANDARD}" != "" ]]; then - if [[ "${CMAKE_CXX_STANDARD}" != "" ]]; then
cmake .. ${CMAKE_OPTIONS} -DJSON_MultipleHeaders=${MULTIPLE_HEADERS} -DCMAKE_CXX_STANDARD=${CMAKECXXSTANDARD} -GNinja && cmake --build . --config Release ; cmake .. ${CMAKE_OPTIONS} -DJSON_MultipleHeaders=${MULTIPLE_HEADERS} -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} -GNinja && cmake --build . --config Release ;
else else
cmake .. ${CMAKE_OPTIONS} -DJSON_MultipleHeaders=${MULTIPLE_HEADERS} -GNinja && cmake --build . --config Release ; cmake .. ${CMAKE_OPTIONS} -DJSON_MultipleHeaders=${MULTIPLE_HEADERS} -GNinja && cmake --build . --config Release ;
fi fi