Switch to ament_cmake_ros_core package (#818)

cottsay · web-flow · commit f2b320448719 · 2025-04-05T00:27:26.000-05:00
Signed-off-by: Scott K Logan &lt;logans@cottsay.net&gt;
diff --git a/rmw_fastrtps_cpp/CMakeLists.txt b/rmw_fastrtps_cpp/CMakeLists.txt
@@ -30,7 +30,7 @@ if(SECURITY)
   find_package(OpenSSL REQUIRED)
 endif()
 
-find_package(ament_cmake_ros REQUIRED)
+find_package(ament_cmake_ros_core REQUIRED)
 
 find_package(rcpputils REQUIRED)
 find_package(rcutils REQUIRED)
diff --git a/rmw_fastrtps_cpp/package.xml b/rmw_fastrtps_cpp/package.xml
@@ -15,7 +15,7 @@
   <author email="michel@ekumenlabs.com">Michel Hidalgo</author>
   <author>Ricardo González</author>
 
-  <buildtool_depend>ament_cmake_ros</buildtool_depend>
+  <buildtool_depend>ament_cmake_ros_core</buildtool_depend>
 
   <buildtool_export_depend>ament_cmake</buildtool_export_depend>
 
diff --git a/rmw_fastrtps_dynamic_cpp/CMakeLists.txt b/rmw_fastrtps_dynamic_cpp/CMakeLists.txt
@@ -30,7 +30,7 @@ if(SECURITY)
   find_package(OpenSSL REQUIRED)
 endif()
 
-find_package(ament_cmake_ros REQUIRED)
+find_package(ament_cmake_ros_core REQUIRED)
 
 find_package(rcpputils REQUIRED)
 find_package(rcutils REQUIRED)
diff --git a/rmw_fastrtps_dynamic_cpp/package.xml b/rmw_fastrtps_dynamic_cpp/package.xml
@@ -15,7 +15,7 @@
   <author email="michel@ekumenlabs.com">Michel Hidalgo</author>
   <author>Ricardo González</author>
 
-  <buildtool_depend>ament_cmake_ros</buildtool_depend>
+  <buildtool_depend>ament_cmake_ros_core</buildtool_depend>
 
   <buildtool_export_depend>ament_cmake</buildtool_export_depend>
 
diff --git a/rmw_fastrtps_shared_cpp/CMakeLists.txt b/rmw_fastrtps_shared_cpp/CMakeLists.txt
@@ -34,7 +34,7 @@ if(SECURITY)
   find_package(OpenSSL REQUIRED)
 endif()
 
-find_package(ament_cmake_ros REQUIRED)
+find_package(ament_cmake_ros_core REQUIRED)
 find_package(rosidl_dynamic_typesupport REQUIRED)
 
 find_package(rcpputils REQUIRED)
diff --git a/rmw_fastrtps_shared_cpp/package.xml b/rmw_fastrtps_shared_cpp/package.xml
@@ -15,7 +15,7 @@
   <author email="michel@ekumenlabs.com">Michel Hidalgo</author>
   <author>Ricardo González</author>
 
-  <buildtool_depend>ament_cmake_ros</buildtool_depend>
+  <buildtool_depend>ament_cmake_ros_core</buildtool_depend>
 
   <buildtool_export_depend>ament_cmake</buildtool_export_depend>
 
@@ -44,6 +44,8 @@
   <build_export_depend>rosidl_typesupport_introspection_cpp</build_export_depend>
   <build_export_depend>tracetools</build_export_depend>
 
+  <test_depend>ament_cmake_gmock</test_depend>
+  <test_depend>ament_cmake_gtest</test_depend>
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>ament_lint_common</test_depend>
   <test_depend>osrf_testing_tools_cpp</test_depend>
diff --git a/rmw_fastrtps_shared_cpp/test/CMakeLists.txt b/rmw_fastrtps_shared_cpp/test/CMakeLists.txt
@@ -1,3 +1,4 @@
+find_package(ament_cmake_gmock REQUIRED)
 find_package(ament_cmake_gtest REQUIRED)
 find_package(osrf_testing_tools_cpp REQUIRED)
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+find_package(ament_cmake_gmock REQUIRED)`
`1`	`2`	`find_package(ament_cmake_gtest REQUIRED)`
`2`	`3`	`find_package(osrf_testing_tools_cpp REQUIRED)`
`3`	`4`