Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[rclcpp_action] removed rosidl_generator_c dependency #992

Merged
merged 3 commits into from
Feb 27, 2020
Merged

[rclcpp_action] removed rosidl_generator_c dependency #992

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e852aa
rclcpp_action removed rosidl_generator_cpp and rosidl_generator_c dep…
ahcorde Feb 14, 2020
6cc86e1
rclcpp_action restored rosidl_generator_c dependency
ahcorde Feb 14, 2020
92d1494
rclcpp action alpha order CMakeLists.txt
ahcorde Feb 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions rclcpp_action/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ find_package(ament_cmake_ros REQUIRED)
find_package(action_msgs REQUIRED)
find_package(rclcpp REQUIRED)
find_package(rcl_action REQUIRED)
find_package(rosidl_generator_cpp REQUIRED)
find_package(rosidl_generator_c REQUIRED)

# Default to C++14
if(NOT CMAKE_CXX_STANDARD)
Expand All @@ -32,9 +32,9 @@ add_library(${PROJECT_NAME}
ament_target_dependencies(${PROJECT_NAME}
"action_msgs"
"rcl_action"
"rclcpp"
"rosidl_generator_c"
"rosidl_generator_cpp")
"rclcpp"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: revert order change.

)

# Causes the visibility macros to use dllexport rather than dllimport,
# which is appropriate when building the dll but not consuming it.
Expand All @@ -61,7 +61,6 @@ ament_export_dependencies(action_msgs)
ament_export_dependencies(rclcpp)
ament_export_dependencies(rcl_action)
ament_export_dependencies(rosidl_generator_c)
ament_export_dependencies(rosidl_generator_cpp)

if(BUILD_TESTING)
find_package(ament_cmake_gtest REQUIRED)
Expand Down
2 changes: 0 additions & 2 deletions rclcpp_action/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@

<buildtool_depend>ament_cmake_ros</buildtool_depend>

<build_export_depend>rosidl_generator_cpp</build_export_depend>
<build_export_depend>rosidl_generator_c</build_export_depend>

<build_depend>rosidl_generator_c</build_depend>
<build_depend>rosidl_generator_cpp</build_depend>

<depend>action_msgs</depend>
<depend>rclcpp</depend>
Expand Down