niklas/rclcpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[rclcpp_action] removed rosidl_generator_c dependency (#992)

Browse source 
* rclcpp_action removed rosidl_generator_cpp and rosidl_generator_c dependencies

Signed-off-by: Alejandro Hernández <ahcorde@gmail.com>

* rclcpp_action restored rosidl_generator_c dependency

Signed-off-by: Alejandro Hernández <ahcorde@gmail.com>

* rclcpp action alpha order CMakeLists.txt

Signed-off-by: Alejandro Hernández <ahcorde@gmail.com>
This commit is contained in:
Alejandro Hernández Cordero 2020-02-27 18:25:10 +01:00 • committed by GitHub
parent 090e1cbec3
commit 88ce87457c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rclcpp_action/CMakeLists.txt
View file

@ -6,7 +6,7 @@ find_package(ament_cmake_ros REQUIRED)
find_package(action_msgs REQUIRED) find_package(action_msgs REQUIRED)
find_package(rclcpp REQUIRED) find_package(rclcpp REQUIRED)
find_package(rcl_action REQUIRED) find_package(rcl_action REQUIRED)
find_package(rosidl_generator_cpp REQUIRED) find_package(rosidl_generator_c REQUIRED)
# Default to C++14 # Default to C++14
if(NOT CMAKE_CXX_STANDARD) if(NOT CMAKE_CXX_STANDARD)
@ -34,7 +34,7 @@ ament_target_dependencies(${PROJECT_NAME}
"rcl_action" "rcl_action"
"rclcpp" "rclcpp"
"rosidl_generator_c" "rosidl_generator_c"
"rosidl_generator_cpp") )
# Causes the visibility macros to use dllexport rather than dllimport, # Causes the visibility macros to use dllexport rather than dllimport,
# which is appropriate when building the dll but not consuming it. # which is appropriate when building the dll but not consuming it.
@ -61,7 +61,6 @@ ament_export_dependencies(action_msgs)
ament_export_dependencies(rclcpp) ament_export_dependencies(rclcpp)
ament_export_dependencies(rcl_action) ament_export_dependencies(rcl_action)
ament_export_dependencies(rosidl_generator_c) ament_export_dependencies(rosidl_generator_c)
ament_export_dependencies(rosidl_generator_cpp)
if(BUILD_TESTING) if(BUILD_TESTING)
find_package(ament_cmake_gtest REQUIRED) find_package(ament_cmake_gtest REQUIRED)

2
rclcpp_action/package.xml
View file

@ -9,11 +9,9 @@
<buildtool_depend>ament_cmake_ros</buildtool_depend> <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_export_depend>rosidl_generator_c</build_export_depend>
<build_depend>rosidl_generator_c</build_depend> <build_depend>rosidl_generator_c</build_depend>
<build_depend>rosidl_generator_cpp</build_depend>
<depend>action_msgs</depend> <depend>action_msgs</depend>
<depend>rclcpp</depend> <depend>rclcpp</depend>