From 4507d7a40beac4586480492c370a587b11d0e4b8 Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Thu, 5 Jul 2018 13:01:23 -0700 Subject: [PATCH] Fix rosidl dependencies (#507) * [rclcpp_lifecycle] remove rosidl deps as this package doesnt generate any messages * depend on rosidl_typesupport_cpp --- rclcpp_lifecycle/CMakeLists.txt | 5 ++++- rclcpp_lifecycle/package.xml | 9 ++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/rclcpp_lifecycle/CMakeLists.txt b/rclcpp_lifecycle/CMakeLists.txt index 1862810..87d5022 100644 --- a/rclcpp_lifecycle/CMakeLists.txt +++ b/rclcpp_lifecycle/CMakeLists.txt @@ -13,6 +13,7 @@ endif() find_package(ament_cmake_ros REQUIRED) find_package(rclcpp REQUIRED) find_package(rcl_lifecycle REQUIRED) +find_package(rosidl_typesupport_cpp REQUIRED) find_package(std_msgs REQUIRED) find_package(lifecycle_msgs REQUIRED) @@ -29,7 +30,9 @@ add_library(rclcpp_lifecycle ament_target_dependencies(rclcpp_lifecycle "rclcpp" "rcl_lifecycle" - "lifecycle_msgs") + "lifecycle_msgs" + "rosidl_typesupport_cpp" +) # Causes the visibility macros to use dllexport rather than dllimport, # which is appropriate when building the dll but not consuming it. diff --git a/rclcpp_lifecycle/package.xml b/rclcpp_lifecycle/package.xml index 4ffe033..baf4fd3 100644 --- a/rclcpp_lifecycle/package.xml +++ b/rclcpp_lifecycle/package.xml @@ -8,22 +8,21 @@ Apache License 2.0 ament_cmake_ros - rosidl_default_generators + lifecycle_msgs rclcpp rcl_lifecycle rmw_implementation - rosidl_default_generators + rosidl_typesupport_cpp std_msgs - lifecycle_msgs + lifecycle_msgs rclcpp rcl_lifecycle rclpy rmw_implementation - rosidl_default_runtime + rosidl_typesupport_cpp std_msgs - lifecycle_msgs ament_cmake_gtest ament_lint_auto