From cdc7302da973ca57790caa67dc44e725cc8df966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Hern=C3=A1ndez=20Cordero?= Date: Fri, 10 Apr 2020 12:23:40 +0200 Subject: [PATCH] added rosidl_runtime c and cpp depencencies (#351) * added rosidl_runtime c and cpp depencencies Signed-off-by: ahcorde * Removed rosidl_generator_c and rosidl_generator_cpp dependencies Signed-off-by: ahcorde * Restored rmw_fastrtps_shared_cpp dependencies Signed-off-by: ahcorde * Fixed rmw_fastrtps_dynamic_cpp rosidl dependencies Signed-off-by: ahcorde * Fixed rmw_fastrtps_cpp rosidl dependencies and alphabetizer order Signed-off-by: ahcorde * Removed rosidl_generator_c depend - rmw_fastrtps_dynamic_cpp Signed-off-by: ahcorde * rmw_fastrtps_shared_cpp buildtool_depend and buildtool_export_depend rosidl_cmake Signed-off-by: ahcorde * keep the originally used dependency type Signed-off-by: ahcorde * Removed rosidl from package.xml Signed-off-by: ahcorde --- rmw_fastrtps_cpp/CMakeLists.txt | 12 ++++++------ rmw_fastrtps_cpp/package.xml | 8 ++++---- rmw_fastrtps_dynamic_cpp/CMakeLists.txt | 6 +++--- rmw_fastrtps_dynamic_cpp/package.xml | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/rmw_fastrtps_cpp/CMakeLists.txt b/rmw_fastrtps_cpp/CMakeLists.txt index c643581cc..cc7105556 100644 --- a/rmw_fastrtps_cpp/CMakeLists.txt +++ b/rmw_fastrtps_cpp/CMakeLists.txt @@ -41,7 +41,7 @@ find_package(fastrtps REQUIRED CONFIG) find_package(FastRTPS REQUIRED MODULE) find_package(rmw REQUIRED) -find_package(rosidl_generator_c REQUIRED) +find_package(rosidl_runtime_c REQUIRED) find_package(rosidl_typesupport_fastrtps_c REQUIRED) find_package(rosidl_typesupport_fastrtps_cpp REQUIRED) @@ -102,7 +102,7 @@ ament_target_dependencies(rmw_fastrtps_cpp "rmw_dds_common" "rmw_fastrtps_shared_cpp" "rmw" - "rosidl_generator_c" + "rosidl_runtime_c" ) target_link_libraries(rmw_fastrtps_cpp @@ -120,12 +120,12 @@ PRIVATE "RMW_FASTRTPS_CPP_BUILDING_LIBRARY") ament_export_include_directories(include) ament_export_libraries(rmw_fastrtps_cpp) -ament_export_dependencies(rosidl_typesupport_fastrtps_cpp) -ament_export_dependencies(rosidl_typesupport_fastrtps_c) -ament_export_dependencies(rosidl_generator_c) ament_export_dependencies(rcutils) -ament_export_dependencies(rmw_fastrtps_shared_cpp) ament_export_dependencies(rmw) +ament_export_dependencies(rmw_fastrtps_shared_cpp) +ament_export_dependencies(rosidl_runtime_c) +ament_export_dependencies(rosidl_typesupport_fastrtps_c) +ament_export_dependencies(rosidl_typesupport_fastrtps_cpp) register_rmw_implementation( "c:rosidl_typesupport_c:rosidl_typesupport_fastrtps_c" diff --git a/rmw_fastrtps_cpp/package.xml b/rmw_fastrtps_cpp/package.xml index 1bc9da807..1d2c63c52 100644 --- a/rmw_fastrtps_cpp/package.xml +++ b/rmw_fastrtps_cpp/package.xml @@ -22,8 +22,8 @@ rmw rmw_dds_common rmw_fastrtps_shared_cpp - rosidl_generator_c - rosidl_generator_cpp + rosidl_runtime_c + rosidl_runtime_cpp rosidl_typesupport_fastrtps_c rosidl_typesupport_fastrtps_cpp @@ -34,8 +34,8 @@ rmw_dds_common rmw_fastrtps_shared_cpp rmw - rosidl_generator_c - rosidl_generator_cpp + rosidl_runtime_c + rosidl_runtime_cpp rosidl_typesupport_fastrtps_c rosidl_typesupport_fastrtps_cpp diff --git a/rmw_fastrtps_dynamic_cpp/CMakeLists.txt b/rmw_fastrtps_dynamic_cpp/CMakeLists.txt index 1c0ffe6c3..8f7f6bdd5 100644 --- a/rmw_fastrtps_dynamic_cpp/CMakeLists.txt +++ b/rmw_fastrtps_dynamic_cpp/CMakeLists.txt @@ -42,7 +42,7 @@ find_package(fastrtps REQUIRED CONFIG) find_package(FastRTPS REQUIRED MODULE) find_package(rmw REQUIRED) -find_package(rosidl_generator_c REQUIRED) +find_package(rosidl_runtime_c REQUIRED) find_package(rosidl_typesupport_fastrtps_c REQUIRED) find_package(rosidl_typesupport_fastrtps_cpp REQUIRED) find_package(rosidl_typesupport_introspection_c REQUIRED) @@ -111,7 +111,7 @@ ament_target_dependencies(rmw_fastrtps_dynamic_cpp "rmw_dds_common" "rmw_fastrtps_shared_cpp" "rmw" - "rosidl_generator_c" + "rosidl_runtime_c" ) target_link_libraries(rmw_fastrtps_dynamic_cpp @@ -133,7 +133,7 @@ ament_export_dependencies(rosidl_typesupport_fastrtps_c) ament_export_dependencies(rosidl_typesupport_fastrtps_cpp) ament_export_dependencies(rosidl_typesupport_introspection_cpp) ament_export_dependencies(rosidl_typesupport_introspection_c) -ament_export_dependencies(rosidl_generator_c) +ament_export_dependencies(rosidl_runtime_c) ament_export_dependencies(rcpputils) ament_export_dependencies(rcutils) ament_export_dependencies(rmw_fastrtps_shared_cpp) diff --git a/rmw_fastrtps_dynamic_cpp/package.xml b/rmw_fastrtps_dynamic_cpp/package.xml index cfc49d436..141fa8079 100644 --- a/rmw_fastrtps_dynamic_cpp/package.xml +++ b/rmw_fastrtps_dynamic_cpp/package.xml @@ -21,7 +21,7 @@ rmw rmw_dds_common rmw_fastrtps_shared_cpp - rosidl_generator_c + rosidl_runtime_c rosidl_typesupport_fastrtps_c rosidl_typesupport_fastrtps_cpp rosidl_typesupport_introspection_c @@ -35,7 +35,7 @@ rmw rmw_dds_common rmw_fastrtps_shared_cpp - rosidl_generator_c + rosidl_runtime_c rosidl_typesupport_fastrtps_c rosidl_typesupport_fastrtps_cpp rosidl_typesupport_introspection_c