From 6bc0621af7c51c34727af7dba19cb4217e650322 Mon Sep 17 00:00:00 2001 From: ahcorde Date: Thu, 5 Mar 2020 18:19:28 +0100 Subject: [PATCH 1/5] Changed rosidl_generator_c/cpp to rosidl_runtime_c/cpp Signed-off-by: ahcorde --- rcl/CMakeLists.txt | 4 +--- rcl/package.xml | 1 - rcl_action/CMakeLists.txt | 3 --- rcl_action/package.xml | 2 +- rcl_lifecycle/CMakeLists.txt | 2 -- rcl_lifecycle/package.xml | 4 ++-- 6 files changed, 4 insertions(+), 12 deletions(-) diff --git a/rcl/CMakeLists.txt b/rcl/CMakeLists.txt index cca35b24b..63811d79a 100644 --- a/rcl/CMakeLists.txt +++ b/rcl/CMakeLists.txt @@ -9,7 +9,6 @@ find_package(rcl_yaml_param_parser REQUIRED) find_package(rcutils REQUIRED) find_package(rmw REQUIRED) find_package(rmw_implementation REQUIRED) -find_package(rosidl_generator_c REQUIRED) find_package(tinydir_vendor REQUIRED) find_package(tracetools REQUIRED) @@ -70,7 +69,6 @@ ament_target_dependencies(${PROJECT_NAME} "rmw_implementation" "rmw" "rcutils" - "rosidl_generator_c" ${RCL_LOGGING_IMPL} "tinydir_vendor" "tracetools" @@ -103,7 +101,7 @@ ament_export_dependencies(rcl_yaml_param_parser) ament_export_dependencies(rmw_implementation) ament_export_dependencies(rmw) ament_export_dependencies(rcutils) -ament_export_dependencies(rosidl_generator_c) +ament_export_dependencies(rosidl_runtime_c) ament_export_dependencies(${RCL_LOGGING_IMPL}) ament_export_dependencies(tracetools) diff --git a/rcl/package.xml b/rcl/package.xml index c7c40025c..89503a5b0 100644 --- a/rcl/package.xml +++ b/rcl/package.xml @@ -18,7 +18,6 @@ rcl_yaml_param_parser rcutils rmw_implementation - rosidl_generator_c tinydir_vendor tracetools diff --git a/rcl_action/CMakeLists.txt b/rcl_action/CMakeLists.txt index f033b23d1..6e9d63d96 100644 --- a/rcl_action/CMakeLists.txt +++ b/rcl_action/CMakeLists.txt @@ -4,7 +4,6 @@ project(rcl_action) find_package(ament_cmake_ros REQUIRED) -find_package(rosidl_generator_c REQUIRED) find_package(action_msgs REQUIRED) find_package(rcl REQUIRED) find_package(rcutils REQUIRED) @@ -54,7 +53,6 @@ ament_target_dependencies(${PROJECT_NAME} "rcl" "rcutils" "rmw" - "rosidl_generator_c" ) rcl_set_symbol_visibility_hidden(${PROJECT_NAME} LANGUAGE "C") @@ -210,5 +208,4 @@ ament_export_dependencies(rcl) ament_export_dependencies(rcutils) ament_export_dependencies(rmw) ament_export_dependencies(action_msgs) -ament_export_dependencies(rosidl_generator_c) ament_package() diff --git a/rcl_action/package.xml b/rcl_action/package.xml index acb39fbc0..b0a9a75bb 100644 --- a/rcl_action/package.xml +++ b/rcl_action/package.xml @@ -13,7 +13,7 @@ rcl rcutils rmw - rosidl_generator_c + rosidl_runtime_c ament_cmake_gtest ament_lint_common diff --git a/rcl_lifecycle/CMakeLists.txt b/rcl_lifecycle/CMakeLists.txt index d92f9b546..4ebad6efa 100644 --- a/rcl_lifecycle/CMakeLists.txt +++ b/rcl_lifecycle/CMakeLists.txt @@ -8,7 +8,6 @@ find_package(lifecycle_msgs REQUIRED) find_package(rcl REQUIRED) find_package(rcutils REQUIRED) find_package(rmw REQUIRED) -find_package(rosidl_generator_c) include_directories(include) @@ -45,7 +44,6 @@ add_library( ament_target_dependencies(rcl_lifecycle "rcl" "lifecycle_msgs" - "rosidl_generator_c" "rcutils" ) diff --git a/rcl_lifecycle/package.xml b/rcl_lifecycle/package.xml index d8f99d08e..d53639366 100644 --- a/rcl_lifecycle/package.xml +++ b/rcl_lifecycle/package.xml @@ -13,13 +13,13 @@ rcl rcutils rmw - rosidl_generator_c + rosidl_runtime_c lifecycle_msgs rcl rcutils rmw - rosidl_generator_c + rosidl_runtime_c ament_cmake_gtest ament_lint_common From 837f09911d5da1c814b1d8a5af685427f930bbdb Mon Sep 17 00:00:00 2001 From: ahcorde Date: Fri, 6 Mar 2020 13:00:55 +0100 Subject: [PATCH 2/5] Fixed rcl rcl_runtime_c dependency Signed-off-by: ahcorde --- rcl/CMakeLists.txt | 8 +++++--- rcl/package.xml | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rcl/CMakeLists.txt b/rcl/CMakeLists.txt index 63811d79a..dcd743548 100644 --- a/rcl/CMakeLists.txt +++ b/rcl/CMakeLists.txt @@ -9,6 +9,7 @@ find_package(rcl_yaml_param_parser REQUIRED) find_package(rcutils REQUIRED) find_package(rmw REQUIRED) find_package(rmw_implementation REQUIRED) +find_package(rosidl_runtime_c REQUIRED) find_package(tinydir_vendor REQUIRED) find_package(tracetools REQUIRED) @@ -66,10 +67,11 @@ add_library(${PROJECT_NAME} ${${PROJECT_NAME}_sources}) ament_target_dependencies(${PROJECT_NAME} "rcl_interfaces" "rcl_yaml_param_parser" - "rmw_implementation" - "rmw" "rcutils" + "rmw" + "rmw_implementation" ${RCL_LOGGING_IMPL} + "rosidl_runtime_c" "tinydir_vendor" "tracetools" ) @@ -101,8 +103,8 @@ ament_export_dependencies(rcl_yaml_param_parser) ament_export_dependencies(rmw_implementation) ament_export_dependencies(rmw) ament_export_dependencies(rcutils) -ament_export_dependencies(rosidl_runtime_c) ament_export_dependencies(${RCL_LOGGING_IMPL}) +ament_export_dependencies(rosidl_runtime_c) ament_export_dependencies(tracetools) if(BUILD_TESTING) diff --git a/rcl/package.xml b/rcl/package.xml index 89503a5b0..d2960f8dc 100644 --- a/rcl/package.xml +++ b/rcl/package.xml @@ -18,6 +18,7 @@ rcl_yaml_param_parser rcutils rmw_implementation + rosidl_runtime_c tinydir_vendor tracetools From eca7fe92b79123b6b478514e4c45f844239837d4 Mon Sep 17 00:00:00 2001 From: ahcorde Date: Fri, 6 Mar 2020 13:01:06 +0100 Subject: [PATCH 3/5] Fixed rcl_action rcl_runtime_c dependency Signed-off-by: ahcorde --- rcl_action/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rcl_action/CMakeLists.txt b/rcl_action/CMakeLists.txt index 6e9d63d96..8a0426794 100644 --- a/rcl_action/CMakeLists.txt +++ b/rcl_action/CMakeLists.txt @@ -8,6 +8,7 @@ find_package(action_msgs REQUIRED) find_package(rcl REQUIRED) find_package(rcutils REQUIRED) find_package(rmw REQUIRED) +find_package(rosidl_runtime_c REQUIRED) include_directories( include @@ -53,6 +54,7 @@ ament_target_dependencies(${PROJECT_NAME} "rcl" "rcutils" "rmw" + "rosidl_runtime_c" ) rcl_set_symbol_visibility_hidden(${PROJECT_NAME} LANGUAGE "C") @@ -203,9 +205,10 @@ endif() # specific order: dependents before dependencies ament_export_include_directories(include) ament_export_libraries(${PROJECT_NAME}) +ament_export_dependencies(action_msgs) ament_export_dependencies(ament_cmake) ament_export_dependencies(rcl) ament_export_dependencies(rcutils) ament_export_dependencies(rmw) -ament_export_dependencies(action_msgs) +ament_export_dependencies(rosidl_runtime_c) ament_package() From 831d2172e328b82f6cf20712a43abcd5d34c87cb Mon Sep 17 00:00:00 2001 From: ahcorde Date: Fri, 6 Mar 2020 13:01:19 +0100 Subject: [PATCH 4/5] Fixed rcl_lifecycle rcl_runtime_c dependency Signed-off-by: ahcorde --- rcl_lifecycle/CMakeLists.txt | 7 +++++-- rcl_lifecycle/package.xml | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rcl_lifecycle/CMakeLists.txt b/rcl_lifecycle/CMakeLists.txt index 4ebad6efa..6df980f8c 100644 --- a/rcl_lifecycle/CMakeLists.txt +++ b/rcl_lifecycle/CMakeLists.txt @@ -8,6 +8,7 @@ find_package(lifecycle_msgs REQUIRED) find_package(rcl REQUIRED) find_package(rcutils REQUIRED) find_package(rmw REQUIRED) +find_package(rosidl_runtime_c REQUIRED) include_directories(include) @@ -42,9 +43,10 @@ add_library( # specific order: dependents before dependencies ament_target_dependencies(rcl_lifecycle - "rcl" "lifecycle_msgs" + "rcl" "rcutils" + "rosidl_runtime_c" ) rcl_set_symbol_visibility_hidden(${PROJECT_NAME} LANGUAGE "C") @@ -100,9 +102,10 @@ endif() ament_export_include_directories(include) ament_export_libraries(${PROJECT_NAME}) ament_export_dependencies(ament_cmake) -ament_export_dependencies(rcl) ament_export_dependencies(lifecycle_msgs) +ament_export_dependencies(rcl) ament_export_dependencies(rcutils) +ament_export_dependencies(rosidl_runtime_c) ament_package() install( diff --git a/rcl_lifecycle/package.xml b/rcl_lifecycle/package.xml index d53639366..9280a6ac6 100644 --- a/rcl_lifecycle/package.xml +++ b/rcl_lifecycle/package.xml @@ -13,13 +13,13 @@ rcl rcutils rmw - rosidl_runtime_c lifecycle_msgs rcl rcutils rmw - rosidl_runtime_c + + rosidl_runtime_c ament_cmake_gtest ament_lint_common From ee98f2138532510664729f43f46d4575fa690131 Mon Sep 17 00:00:00 2001 From: ahcorde Date: Tue, 7 Apr 2020 11:06:55 +0200 Subject: [PATCH 5/5] keep the originally used dependency type Signed-off-by: ahcorde --- rcl_lifecycle/package.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rcl_lifecycle/package.xml b/rcl_lifecycle/package.xml index 9280a6ac6..d53639366 100644 --- a/rcl_lifecycle/package.xml +++ b/rcl_lifecycle/package.xml @@ -13,13 +13,13 @@ rcl rcutils rmw + rosidl_runtime_c lifecycle_msgs rcl rcutils rmw - - rosidl_runtime_c + rosidl_runtime_c ament_cmake_gtest ament_lint_common