Update to C++17 (#125)

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
ros2 · Aug 3, 2023 · 721dd88 · 721dd88
1 parent 6b73258
commit 721dd88
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/rmw_connextdds/CMakeLists.txt b/rmw_connextdds/CMakeLists.txt
@@ -16,9 +16,10 @@ cmake_minimum_required(VERSION 3.5)
 
 project(rmw_connextdds)
 
-# Default to C++14
+# Default to C++17
 if(NOT CMAKE_CXX_STANDARD)
-    set(CMAKE_CXX_STANDARD 14)
+    set(CMAKE_CXX_STANDARD 17)
+    set(CMAKE_CXX_STANDARD_REQUIRED ON)
 endif()
 
 find_package(ament_cmake REQUIRED)
@@ -73,4 +74,4 @@ ament_package(
 )
 
 ament_index_register_resource("rmw_output_prefixes"
-  CONTENT "RTI Data Distribution Service\nRTI Connext DDS\nExpires on")
+  CONTENT "RTI Data Distribution Service\nRTI Connext DDS\nExpires on")
diff --git a/rmw_connextdds_common/CMakeLists.txt b/rmw_connextdds_common/CMakeLists.txt
@@ -38,9 +38,10 @@ function(rtirmw_add_library)
       ${ARGN} # current function arguments
     )
 
-    # Default to C++14
+    # Default to C++17
     if(NOT CMAKE_CXX_STANDARD)
-        set(CMAKE_CXX_STANDARD 14)
+        set(CMAKE_CXX_STANDARD 17)
+        set(CMAKE_CXX_STANDARD_REQUIRED ON)
     endif()
 
     if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")

diff --git a/rmw_connextddsmicro/CMakeLists.txt b/rmw_connextddsmicro/CMakeLists.txt
@@ -16,9 +16,10 @@ cmake_minimum_required(VERSION 3.5)
 
 project(rmw_connextddsmicro)
 
-# Default to C++14
+# Default to C++17
 if(NOT CMAKE_CXX_STANDARD)
-    set(CMAKE_CXX_STANDARD 14)
+    set(CMAKE_CXX_STANDARD 17)
+    set(CMAKE_CXX_STANDARD_REQUIRED ON)
 endif()
 
 find_package(ament_cmake REQUIRED)