File tree 6 files changed +16
-11
lines changed
rosidl_typesupport_interface
rosidl_typesupport_introspection_cpp
6 files changed +16
-11
lines changed Original file line number Diff line number Diff line change @@ -34,9 +34,9 @@ if(BUILD_TESTING)
34
34
SKIP_INSTALL
35
35
)
36
36
37
- # Default to C++14
37
+ # Default to C++17
38
38
if (NOT CMAKE_CXX_STANDARD)
39
- set (CMAKE_CXX_STANDARD 14 )
39
+ set (CMAKE_CXX_STANDARD 17 )
40
40
endif ()
41
41
42
42
if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
Original file line number Diff line number Diff line change @@ -59,9 +59,9 @@ if(BUILD_TESTING)
59
59
60
60
# For gtest
61
61
enable_language (CXX)
62
- # Default to C++14
62
+ # Default to C++17
63
63
if (NOT CMAKE_CXX_STANDARD)
64
- set (CMAKE_CXX_STANDARD 14 )
64
+ set (CMAKE_CXX_STANDARD 17 )
65
65
endif ()
66
66
67
67
find_package (ament_cmake_gtest REQUIRED)
Original file line number Diff line number Diff line change @@ -9,6 +9,11 @@ target_include_directories(${PROJECT_NAME} INTERFACE
9
9
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR} /include>"
10
10
"$<INSTALL_INTERFACE:include>" )
11
11
12
+ if (MSVC )
13
+ target_compile_definitions (${PROJECT_NAME} INTERFACE
14
+ _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING)
15
+ endif ()
16
+
12
17
ament_export_include_directories(include )
13
18
ament_export_targets(${PROJECT_NAME} )
14
19
@@ -25,9 +30,9 @@ if(BUILD_TESTING)
25
30
26
31
find_package (ament_cmake_gtest REQUIRED)
27
32
28
- # Default to C++14
33
+ # Default to C++17
29
34
if (NOT CMAKE_CXX_STANDARD)
30
- set (CMAKE_CXX_STANDARD 14 )
35
+ set (CMAKE_CXX_STANDARD 17 )
31
36
endif ()
32
37
33
38
if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
Original file line number Diff line number Diff line change @@ -21,9 +21,9 @@ if(BUILD_TESTING)
21
21
if (NOT CMAKE_C_STANDARD)
22
22
set (CMAKE_C_STANDARD 11)
23
23
endif ()
24
- # Default to C++14
24
+ # Default to C++17
25
25
if (NOT CMAKE_CXX_STANDARD)
26
- set (CMAKE_CXX_STANDARD 14 )
26
+ set (CMAKE_CXX_STANDARD 17 )
27
27
endif ()
28
28
29
29
find_package (ament_cmake_gtest REQUIRED)
Original file line number Diff line number Diff line change @@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.12)
2
2
3
3
project (rosidl_typesupport_introspection_cpp)
4
4
5
- # Default to C++14
5
+ # Default to C++17
6
6
if (NOT CMAKE_CXX_STANDARD)
7
- set (CMAKE_CXX_STANDARD 14 )
7
+ set (CMAKE_CXX_STANDARD 17 )
8
8
endif ()
9
9
10
10
if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
Original file line number Diff line number Diff line change @@ -98,7 +98,7 @@ if(WIN32)
98
98
endif ()
99
99
if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
100
100
set_target_properties (${rosidl_generate_interfaces_TARGET}${_target_suffix} PROPERTIES
101
- CXX_STANDARD 14
101
+ CXX_STANDARD 17
102
102
COMPILE_OPTIONS -Wall -Wextra -Wpedantic
103
103
)
104
104
endif ()
You can’t perform that action at this time.
0 commit comments