added rosidl_runtime c and cpp depencencies (#100)

* added rosidl_runtime c and cpp depencencies Signed-off-by: ahcorde <ahcorde@gmail.com> * Removed rosidl_generator_c dependency Signed-off-by: ahcorde <ahcorde@gmail.com> * Fixed rosidl_runtime dependencies Signed-off-by: ahcorde <ahcorde@gmail.com> * Fixed rosidl_runtime_c dependencies Signed-off-by: ahcorde <ahcorde@gmail.com> * Fixed rosidl_runtime_c dependencies Signed-off-by: ahcorde <ahcorde@gmail.com> * Removed rosidl_runtime_c from test_depend Signed-off-by: ahcorde <ahcorde@gmail.com> * Added rosidl_generator_x to rosidl_generator_py Signed-off-by: ahcorde <ahcorde@gmail.com> * removed rosidl_generator_x dependencies rosidl_typesupport provides all transitive dependencies Signed-off-by: ahcorde <ahcorde@gmail.com> * Fixed rosidl_generator_py test Signed-off-by: ahcorde <ahcorde@gmail.com>
ros2 · Apr 10, 2020 · dda5ada · dda5ada
1 parent a98f937
commit dda5ada
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/rosidl_generator_py/CMakeLists.txt b/rosidl_generator_py/CMakeLists.txt
@@ -17,7 +17,6 @@ if(BUILD_TESTING)
 
   find_package(rmw REQUIRED)
   find_package(rosidl_cmake REQUIRED)
-  find_package(rosidl_generator_c REQUIRED)
 
   find_package(ament_lint_auto REQUIRED)
   ament_lint_auto_find_test_dependencies()

diff --git a/rosidl_generator_py/cmake/rosidl_generator_py_generate_interfaces.cmake b/rosidl_generator_py/cmake/rosidl_generator_py_generate_interfaces.cmake
@@ -14,7 +14,7 @@
 
 find_package(rmw_implementation_cmake REQUIRED)
 find_package(rmw REQUIRED)
-find_package(rosidl_generator_c REQUIRED)
+find_package(rosidl_runtime_c REQUIRED)
 find_package(rosidl_typesupport_c REQUIRED)
 find_package(rosidl_typesupport_interface REQUIRED)
 
@@ -264,7 +264,7 @@ foreach(_typesupport_impl ${_typesupport_impls})
     ${rosidl_generate_interfaces_TARGET} rosidl_typesupport_c)
 
   ament_target_dependencies(${_target_name}
-    "rosidl_generator_c"
+    "rosidl_runtime_c"
     "rosidl_typesupport_c"
     "rosidl_typesupport_interface"
   )
@@ -278,7 +278,7 @@ foreach(_typesupport_impl ${_typesupport_impls})
     ${rosidl_generate_interfaces_TARGET}__${_typesupport_impl}
   )
   ament_target_dependencies(${_target_name}
-    "rosidl_generator_c"
+    "rosidl_runtime_c"
     "rosidl_generator_py"
   )
 

diff --git a/rosidl_generator_py/package.xml b/rosidl_generator_py/package.xml
@@ -9,6 +9,8 @@
   <author>Esteve Fernandez</author>
   <author>Mikael Arguedas</author>
 
+  <build_depend>rosidl_runtime_c</build_depend>
+
   <buildtool_depend>ament_cmake</buildtool_depend>
 
   <build_export_depend>rmw</build_export_depend>
@@ -20,12 +22,11 @@
   <buildtool_export_depend>rosidl_typesupport_c</buildtool_export_depend>
   <buildtool_export_depend>rosidl_typesupport_interface</buildtool_export_depend>
 
-
   <exec_depend>python3-numpy</exec_depend>
   <exec_depend>rmw_implementation</exec_depend>
   <exec_depend>rmw_implementation_cmake</exec_depend>
-  <exec_depend>rosidl_generator_c</exec_depend>
   <exec_depend>rosidl_parser</exec_depend>
+  <exec_depend>rosidl_runtime_c</exec_depend>
 
   <test_depend>ament_cmake_pytest</test_depend>
   <test_depend>ament_index_python</test_depend>
@@ -39,6 +40,7 @@
   <test_depend>rmw_implementation_cmake</test_depend>
   <test_depend>rosidl_cmake</test_depend>
   <test_depend>rosidl_generator_c</test_depend>
+  <test_depend>rosidl_generator_cpp</test_depend>
   <test_depend>rosidl_parser</test_depend>
   <test_depend>rosidl_typesupport_c</test_depend>
   <test_depend>test_interface_files</test_depend>