Skip to content

Commit

Permalink
Set CMAKE_CXX_STANDARD to 17 (otherwise inline static member variable…
Browse files Browse the repository at this point in the history
…s are not allowed)
  • Loading branch information
allanleal committed Jul 2, 2021
1 parent d8b6ece commit 24fef8a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ target_include_directories(yaml-cpp
if (NOT DEFINED CMAKE_CXX_STANDARD)
set_target_properties(yaml-cpp
PROPERTIES
CXX_STANDARD 11)
CXX_STANDARD 17)
endif()

target_compile_options(yaml-cpp
Expand Down
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ target_link_libraries(yaml-cpp-tests

set_property(TARGET yaml-cpp-tests PROPERTY CXX_STANDARD_REQUIRED ON)
if (NOT DEFINED CMAKE_CXX_STANDARD)
set_target_properties(yaml-cpp-tests PROPERTIES CXX_STANDARD 11)
set_target_properties(yaml-cpp-tests PROPERTIES CXX_STANDARD 17)
endif()


Expand Down
4 changes: 2 additions & 2 deletions test/gtest-1.10.0/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ project(googletest-distribution)
set(GOOGLETEST_VERSION 1.10.0)

if (CMAKE_VERSION VERSION_LESS "3.1")
add_definitions(-std=c++11)
add_definitions(-std=c++17)
else()
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
if(NOT CYGWIN)
set(CMAKE_CXX_EXTENSIONS OFF)
Expand Down
2 changes: 1 addition & 1 deletion util/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ set_target_properties(yaml-cpp-read
if (NOT DEFINED CMAKE_CXX_STANDARD)
set_target_properties(yaml-cpp-sandbox yaml-cpp-parse yaml-cpp-read
PROPERTIES
CXX_STANDARD 11)
CXX_STANDARD 17)
endif()

0 comments on commit 24fef8a

Please sign in to comment.