Skip to content

Commit

Permalink
Fix rosidl dependencies (#507)
Browse files Browse the repository at this point in the history
* [rclcpp_lifecycle] remove rosidl deps as this package doesnt generate any messages

* depend on rosidl_typesupport_cpp
  • Loading branch information
mikaelarguedas committed Jul 5, 2018
1 parent 1869b84 commit 4507d7a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
5 changes: 4 additions & 1 deletion rclcpp_lifecycle/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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.
Expand Down
9 changes: 4 additions & 5 deletions rclcpp_lifecycle/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,21 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake_ros</buildtool_depend>
<buildtool_depend>rosidl_default_generators</buildtool_depend>

<build_depend>lifecycle_msgs</build_depend>
<build_depend>rclcpp</build_depend>
<build_depend>rcl_lifecycle</build_depend>
<build_depend>rmw_implementation</build_depend>
<build_depend>rosidl_default_generators</build_depend>
<build_depend>rosidl_typesupport_cpp</build_depend>
<build_depend>std_msgs</build_depend>
<build_depend>lifecycle_msgs</build_depend>

<exec_depend>lifecycle_msgs</exec_depend>
<exec_depend>rclcpp</exec_depend>
<exec_depend>rcl_lifecycle</exec_depend>
<exec_depend>rclpy</exec_depend>
<exec_depend>rmw_implementation</exec_depend>
<exec_depend>rosidl_default_runtime</exec_depend>
<exec_depend>rosidl_typesupport_cpp</exec_depend>
<exec_depend>std_msgs</exec_depend>
<exec_depend>lifecycle_msgs</exec_depend>

<test_depend>ament_cmake_gtest</test_depend>
<test_depend>ament_lint_auto</test_depend>
Expand Down

0 comments on commit 4507d7a

Please sign in to comment.