Replace rosidl_generator_x for rosidl_runtime_x (#399)

* Replace rosidl_generator_x for rosidl_runtime_x Signed-off-by: ahcorde <ahcorde@gmail.com> * Replaced rosidl_generator_cpp to rosidl_runtime_cpp in rmw_connext_cpp Signed-off-by: ahcorde <ahcorde@gmail.com> * keep the originally used dependency type Signed-off-by: ahcorde <ahcorde@gmail.com>
ros2 · Apr 10, 2020 · 2e26392 · 2e26392
1 parent 5259635
commit 2e26392
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/rmw_connext_cpp/CMakeLists.txt b/rmw_connext_cpp/CMakeLists.txt
@@ -49,8 +49,8 @@ endif()
 
 find_package(rmw REQUIRED)
 find_package(rmw_connext_shared_cpp REQUIRED)
-find_package(rosidl_generator_c REQUIRED)
-find_package(rosidl_generator_cpp REQUIRED)
+find_package(rosidl_runtime_c REQUIRED)
+find_package(rosidl_runtime_cpp REQUIRED)
 
 include_directories(include)
 
@@ -59,8 +59,8 @@ ament_export_dependencies(
  rcutils
  rmw
  rmw_connext_shared_cpp
- rosidl_generator_c
- rosidl_generator_cpp
+ rosidl_runtime_c
+ rosidl_runtime_cpp
  rosidl_typesupport_connext_c
  rosidl_typesupport_connext_cpp)
 
@@ -186,8 +186,8 @@ ament_target_dependencies(rmw_connext_cpp
  "rcutils"
  "rmw"
  "rmw_connext_shared_cpp"
- "rosidl_generator_c"
- "rosidl_generator_cpp"
+ "rosidl_runtime_c"
+ "rosidl_runtime_cpp"
  "rosidl_typesupport_connext_c"
  "rosidl_typesupport_connext_cpp"
  "Connext")

diff --git a/rmw_connext_cpp/package.xml b/rmw_connext_cpp/package.xml
@@ -17,16 +17,16 @@
  <build_depend>rcutils</build_depend>
  <build_depend>rmw</build_depend>
  <build_depend>rmw_connext_shared_cpp</build_depend>
- <build_depend>rosidl_generator_c</build_depend>
- <build_depend>rosidl_generator_cpp</build_depend>
+ <build_depend>rosidl_runtime_c</build_depend>
+ <build_depend>rosidl_runtime_cpp</build_depend>
  <build_depend>rosidl_generator_dds_idl</build_depend>
  <build_depend>rosidl_typesupport_connext_c</build_depend>
  <build_depend>rosidl_typesupport_connext_cpp</build_depend>
  <build_depend>rti-connext-dds-5.3.1</build_depend>
 
  <build_export_depend>connext_cmake_module</build_export_depend>
- <build_export_depend>rosidl_generator_c</build_export_depend>
- <build_export_depend>rosidl_generator_cpp</build_export_depend>
+ <build_export_depend>rosidl_runtime_c</build_export_depend>
+ <build_export_depend>rosidl_runtime_cpp</build_export_depend>
  <build_export_depend>rosidl_typesupport_connext_c</build_export_depend>
  <build_export_depend>rosidl_typesupport_connext_cpp</build_export_depend>
  <build_export_depend>rti-connext-dds-5.3.1</build_export_depend>

diff --git a/rmw_connext_dynamic_cpp/CMakeLists.txt b/rmw_connext_dynamic_cpp/CMakeLists.txt
@@ -43,14 +43,14 @@ endif()
 
 find_package(rmw REQUIRED)
 find_package(rmw_connext_shared_cpp REQUIRED)
-find_package(rosidl_generator_c REQUIRED)
-find_package(rosidl_generator_cpp REQUIRED)
+find_package(rosidl_runtime_c REQUIRED)
+find_package(rosidl_runtime_cpp REQUIRED)
 
 ament_export_dependencies(
  rcutils
  rmw rmw_connext_shared_cpp
- rosidl_generator_c
- rosidl_generator_cpp
+ rosidl_runtime_c
+ rosidl_runtime_cpp
  rosidl_typesupport_introspection_c
  rosidl_typesupport_introspection_cpp
 )
@@ -67,8 +67,8 @@ ament_target_dependencies(rmw_connext_dynamic_cpp
  "rosidl_typesupport_introspection_cpp"
  "rmw"
  "rmw_connext_shared_cpp"
- "rosidl_generator_c"
- "rosidl_generator_cpp"
+ "rosidl_runtime_c"
+ "rosidl_runtime_cpp"
  "Connext")
 if(Connext_GLIBCXX_USE_CXX11_ABI_ZERO)
  target_compile_definitions(rmw_connext_dynamic_cpp

diff --git a/rmw_connext_dynamic_cpp/package.xml b/rmw_connext_dynamic_cpp/package.xml
@@ -13,15 +13,15 @@
  <build_depend>rcutils</build_depend>
  <build_depend>rmw</build_depend>
  <build_depend>rmw_connext_shared_cpp</build_depend>
- <build_depend>rosidl_generator_c</build_depend>
- <build_depend>rosidl_generator_cpp</build_depend>
+ <build_depend>rosidl_runtime_c</build_depend>
+ <build_depend>rosidl_runtime_cpp</build_depend>
  <build_depend>rosidl_typesupport_introspection_c</build_depend>
  <build_depend>rosidl_typesupport_introspection_cpp</build_depend>
  <build_depend>rti-connext-dds-5.3.1</build_depend>
 
  <build_export_depend>connext_cmake_module</build_export_depend>
- <build_export_depend>rosidl_generator_c</build_export_depend>
- <build_export_depend>rosidl_generator_cpp</build_export_depend>
+ <build_export_depend>rosidl_runtime_c</build_export_depend>
+ <build_export_depend>rosidl_runtime_cpp</build_export_depend>
  <build_export_depend>rosidl_typesupport_introspection_c</build_export_depend>
  <build_export_depend>rosidl_typesupport_introspection_cpp</build_export_depend>
  <build_export_depend>rti-connext-dds-5.3.1</build_export_depend>