Skip to content

Commit

Permalink
rename CMAKECXXSTANDARD by CMAKE_CXX_STANDARD
Browse files Browse the repository at this point in the history
  • Loading branch information
dota17 committed Jun 28, 2020
1 parent e0f6c96 commit 7df758f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ matrix:
env:
- COMPILER=g++-9
- CXXFLAGS=-std=c++17
- CMAKECXXSTANDARD=17
- CMAKE_CXX_STANDARD=17
addons:
apt:
sources: ['ubuntu-toolchain-r-test']
Expand Down Expand Up @@ -339,8 +339,8 @@ script:

# compile and execute unit tests
- mkdir -p build && cd build
- if [[ "${CMAKECXXSTANDARD}" != "" ]]; then
cmake .. ${CMAKE_OPTIONS} -DJSON_MultipleHeaders=${MULTIPLE_HEADERS} -DCMAKE_CXX_STANDARD=${CMAKECXXSTANDARD} -GNinja && cmake --build . --config Release ;
- if [[ "${CMAKE_CXX_STANDARD}" != "" ]]; then
cmake .. ${CMAKE_OPTIONS} -DJSON_MultipleHeaders=${MULTIPLE_HEADERS} -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} -GNinja && cmake --build . --config Release ;
else
cmake .. ${CMAKE_OPTIONS} -DJSON_MultipleHeaders=${MULTIPLE_HEADERS} -GNinja && cmake --build . --config Release ;
fi
Expand Down

0 comments on commit 7df758f

Please sign in to comment.