Skip to content

Commit 9141792

Browse files
authored
Merge pull request #63 from Garcia6l20/fix/cxx_17_compilation
fix c++17 compilation
2 parents 2eed2e7 + 4c7e60e commit 9141792

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

3rdparty/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11

22
# Rapidjson is an header only library
33
add_library(rapidjson INTERFACE)
4+
if("${CMAKE_CXX_STANDARD}" GREATER_EQUAL 17)
5+
# use of std::iterator is deprecated since c++ 17
6+
target_compile_definitions(rapidjson INTERFACE -DRAPIDJSON_NOMEMBERITERATORCLASS=1)
7+
endif()
48
target_include_directories(rapidjson INTERFACE rapidjson/include)
59

610
# Doctest is an header only on library

CMakeLists_native.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
set(WARNING_FLAGS "-Wall -Wextra -Werror")
77

88
# C/C++ flags
9-
set(C_FLAGS "-std=c11")
10-
set(CXX_FLAGS "-std=c++17")
9+
set(CMAKE_C_STANDARD 11)
10+
set(CMAKE_CXX_STANDARD 17)
1111

1212
# Set compiler flags
13-
set(CMAKE_C_FLAGS_DEBUG "${C_FLAGS} ${WARNING_FLAGS} -O0 -g3 -ggdb3")
14-
set(CMAKE_CXX_FLAGS_DEBUG "${CXX_FLAGS} ${WARNING_FLAGS} -O0 -g3 -ggdb3")
15-
set(CMAKE_C_FLAGS_RELEASE "${C_FLAGS} ${WARNING_FLAGS} -O2 -DNDEBUG")
16-
set(CMAKE_CXX_FLAGS_RELEASE "${CXX_FLAGS} ${WARNING_FLAGS} -O2 -DNDEBUG")
13+
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG_INIT} ${WARNING_FLAGS} -O0 -g3 -ggdb3")
14+
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG_INIT} ${WARNING_FLAGS} -O0 -g3 -ggdb3")
15+
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE_INIT} ${WARNING_FLAGS} -O2 -DNDEBUG")
16+
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE_INIT} ${WARNING_FLAGS} -O2 -DNDEBUG")

0 commit comments

Comments
 (0)