From 7df758f41f97a43d1b562579bd260fee94187b9d Mon Sep 17 00:00:00 2001 From: chenguoping Date: Sun, 28 Jun 2020 09:26:33 +0800 Subject: [PATCH] rename CMAKECXXSTANDARD by CMAKE_CXX_STANDARD --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 480797095..d5811eebd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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'] @@ -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