Changed rosidl_generator_c/cpp to rosidl_runtime_c/cpp (#1014)

Signed-off-by: ahcorde <ahcorde@gmail.com>
This commit is contained in:
Alejandro Hernández Cordero 2020-04-10 12:25:16 +02:00 committed by GitHub
parent fd961bc23f
commit c1a7a65537
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 27 deletions

View file

@ -11,7 +11,7 @@ find_package(rcpputils REQUIRED)
find_package(rcutils REQUIRED) find_package(rcutils REQUIRED)
find_package(rmw REQUIRED) find_package(rmw REQUIRED)
find_package(rosgraph_msgs REQUIRED) find_package(rosgraph_msgs REQUIRED)
find_package(rosidl_generator_cpp REQUIRED) find_package(rosidl_runtime_cpp REQUIRED)
find_package(rosidl_typesupport_c REQUIRED) find_package(rosidl_typesupport_c REQUIRED)
find_package(rosidl_typesupport_cpp REQUIRED) find_package(rosidl_typesupport_cpp REQUIRED)
find_package(tracetools REQUIRED) find_package(tracetools REQUIRED)
@ -120,7 +120,7 @@ ament_target_dependencies(${PROJECT_NAME}
"builtin_interfaces" "builtin_interfaces"
"rosgraph_msgs" "rosgraph_msgs"
"rosidl_typesupport_cpp" "rosidl_typesupport_cpp"
"rosidl_generator_cpp" "rosidl_runtime_cpp"
"tracetools" "tracetools"
) )
@ -147,7 +147,7 @@ ament_export_dependencies(builtin_interfaces)
ament_export_dependencies(rosgraph_msgs) ament_export_dependencies(rosgraph_msgs)
ament_export_dependencies(rosidl_typesupport_cpp) ament_export_dependencies(rosidl_typesupport_cpp)
ament_export_dependencies(rosidl_typesupport_c) ament_export_dependencies(rosidl_typesupport_c)
ament_export_dependencies(rosidl_generator_cpp) ament_export_dependencies(rosidl_runtime_cpp)
ament_export_dependencies(rcl_yaml_param_parser) ament_export_dependencies(rcl_yaml_param_parser)
ament_export_dependencies(tracetools) ament_export_dependencies(tracetools)
@ -169,7 +169,7 @@ if(BUILD_TESTING)
ament_target_dependencies(test_client ament_target_dependencies(test_client
"rcl_interfaces" "rcl_interfaces"
"rmw" "rmw"
"rosidl_generator_cpp" "rosidl_runtime_cpp"
"rosidl_typesupport_cpp" "rosidl_typesupport_cpp"
) )
target_link_libraries(test_client ${PROJECT_NAME}) target_link_libraries(test_client ${PROJECT_NAME})
@ -180,7 +180,7 @@ if(BUILD_TESTING)
"rcl_interfaces" "rcl_interfaces"
"rmw" "rmw"
"rcl" "rcl"
"rosidl_generator_cpp" "rosidl_runtime_cpp"
"rosidl_typesupport_cpp" "rosidl_typesupport_cpp"
) )
target_link_libraries(test_create_timer ${PROJECT_NAME}) target_link_libraries(test_create_timer ${PROJECT_NAME})
@ -191,7 +191,7 @@ if(BUILD_TESTING)
ament_target_dependencies(test_expand_topic_or_service_name ament_target_dependencies(test_expand_topic_or_service_name
"rcl_interfaces" "rcl_interfaces"
"rmw" "rmw"
"rosidl_generator_cpp" "rosidl_runtime_cpp"
"rosidl_typesupport_cpp" "rosidl_typesupport_cpp"
) )
target_link_libraries(test_expand_topic_or_service_name ${PROJECT_NAME}) target_link_libraries(test_expand_topic_or_service_name ${PROJECT_NAME})
@ -201,7 +201,7 @@ if(BUILD_TESTING)
ament_target_dependencies(test_function_traits ament_target_dependencies(test_function_traits
"rcl_interfaces" "rcl_interfaces"
"rmw" "rmw"
"rosidl_generator_cpp" "rosidl_runtime_cpp"
"rosidl_typesupport_cpp" "rosidl_typesupport_cpp"
) )
endif() endif()
@ -211,7 +211,7 @@ if(BUILD_TESTING)
"rcl" "rcl"
"rcl_interfaces" "rcl_interfaces"
"rmw" "rmw"
"rosidl_generator_cpp" "rosidl_runtime_cpp"
"rosidl_typesupport_cpp" "rosidl_typesupport_cpp"
) )
target_link_libraries(test_intra_process_manager ${PROJECT_NAME}) target_link_libraries(test_intra_process_manager ${PROJECT_NAME})
@ -221,7 +221,7 @@ if(BUILD_TESTING)
ament_target_dependencies(test_ring_buffer_implementation ament_target_dependencies(test_ring_buffer_implementation
"rcl_interfaces" "rcl_interfaces"
"rmw" "rmw"
"rosidl_generator_cpp" "rosidl_runtime_cpp"
"rosidl_typesupport_cpp" "rosidl_typesupport_cpp"
) )
target_link_libraries(test_ring_buffer_implementation ${PROJECT_NAME}) target_link_libraries(test_ring_buffer_implementation ${PROJECT_NAME})
@ -231,7 +231,7 @@ if(BUILD_TESTING)
ament_target_dependencies(test_intra_process_buffer ament_target_dependencies(test_intra_process_buffer
"rcl_interfaces" "rcl_interfaces"
"rmw" "rmw"
"rosidl_generator_cpp" "rosidl_runtime_cpp"
"rosidl_typesupport_cpp" "rosidl_typesupport_cpp"
) )
target_link_libraries(test_intra_process_buffer ${PROJECT_NAME}) target_link_libraries(test_intra_process_buffer ${PROJECT_NAME})
@ -249,7 +249,7 @@ if(BUILD_TESTING)
"rcl_interfaces" "rcl_interfaces"
"rcpputils" "rcpputils"
"rmw" "rmw"
"rosidl_generator_cpp" "rosidl_runtime_cpp"
"rosidl_typesupport_cpp" "rosidl_typesupport_cpp"
"test_msgs" "test_msgs"
) )
@ -288,7 +288,7 @@ if(BUILD_TESTING)
ament_target_dependencies(test_node_global_args ament_target_dependencies(test_node_global_args
"rcl_interfaces" "rcl_interfaces"
"rmw" "rmw"
"rosidl_generator_cpp" "rosidl_runtime_cpp"
"rosidl_typesupport_cpp" "rosidl_typesupport_cpp"
) )
target_link_libraries(test_node_global_args ${PROJECT_NAME}) target_link_libraries(test_node_global_args ${PROJECT_NAME})
@ -310,7 +310,7 @@ if(BUILD_TESTING)
ament_target_dependencies(test_parameter_events_filter ament_target_dependencies(test_parameter_events_filter
"rcl_interfaces" "rcl_interfaces"
"rmw" "rmw"
"rosidl_generator_cpp" "rosidl_runtime_cpp"
"rosidl_typesupport_cpp" "rosidl_typesupport_cpp"
) )
target_link_libraries(test_parameter_events_filter ${PROJECT_NAME}) target_link_libraries(test_parameter_events_filter ${PROJECT_NAME})
@ -320,7 +320,7 @@ if(BUILD_TESTING)
ament_target_dependencies(test_parameter ament_target_dependencies(test_parameter
"rcl_interfaces" "rcl_interfaces"
"rmw" "rmw"
"rosidl_generator_cpp" "rosidl_runtime_cpp"
"rosidl_typesupport_cpp" "rosidl_typesupport_cpp"
) )
target_link_libraries(test_parameter ${PROJECT_NAME}) target_link_libraries(test_parameter ${PROJECT_NAME})
@ -333,7 +333,7 @@ if(BUILD_TESTING)
if(TARGET test_publisher) if(TARGET test_publisher)
ament_target_dependencies(test_publisher ament_target_dependencies(test_publisher
"rmw" "rmw"
"rosidl_generator_cpp" "rosidl_runtime_cpp"
"rosidl_typesupport_cpp" "rosidl_typesupport_cpp"
"test_msgs" "test_msgs"
) )
@ -344,7 +344,7 @@ if(BUILD_TESTING)
ament_target_dependencies(test_publisher_subscription_count_api ament_target_dependencies(test_publisher_subscription_count_api
"rcl_interfaces" "rcl_interfaces"
"rmw" "rmw"
"rosidl_generator_cpp" "rosidl_runtime_cpp"
"rosidl_typesupport_cpp" "rosidl_typesupport_cpp"
"test_msgs" "test_msgs"
) )
@ -374,7 +374,7 @@ if(BUILD_TESTING)
ament_target_dependencies(test_rate ament_target_dependencies(test_rate
"rcl_interfaces" "rcl_interfaces"
"rmw" "rmw"
"rosidl_generator_cpp" "rosidl_runtime_cpp"
"rosidl_typesupport_cpp" "rosidl_typesupport_cpp"
) )
target_link_libraries(test_rate target_link_libraries(test_rate
@ -395,7 +395,7 @@ if(BUILD_TESTING)
ament_target_dependencies(test_service ament_target_dependencies(test_service
"rcl_interfaces" "rcl_interfaces"
"rmw" "rmw"
"rosidl_generator_cpp" "rosidl_runtime_cpp"
"rosidl_typesupport_cpp" "rosidl_typesupport_cpp"
) )
target_link_libraries(test_service ${PROJECT_NAME}) target_link_libraries(test_service ${PROJECT_NAME})
@ -405,7 +405,7 @@ if(BUILD_TESTING)
ament_target_dependencies(test_subscription ament_target_dependencies(test_subscription
"rcl_interfaces" "rcl_interfaces"
"rmw" "rmw"
"rosidl_generator_cpp" "rosidl_runtime_cpp"
"rosidl_typesupport_cpp" "rosidl_typesupport_cpp"
"test_msgs" "test_msgs"
) )
@ -416,7 +416,7 @@ if(BUILD_TESTING)
ament_target_dependencies(test_subscription_publisher_count_api ament_target_dependencies(test_subscription_publisher_count_api
"rcl_interfaces" "rcl_interfaces"
"rmw" "rmw"
"rosidl_generator_cpp" "rosidl_runtime_cpp"
"rosidl_typesupport_cpp" "rosidl_typesupport_cpp"
"test_msgs" "test_msgs"
) )

View file

@ -12,13 +12,13 @@
<build_depend>builtin_interfaces</build_depend> <build_depend>builtin_interfaces</build_depend>
<build_depend>rcl_interfaces</build_depend> <build_depend>rcl_interfaces</build_depend>
<build_depend>rosgraph_msgs</build_depend> <build_depend>rosgraph_msgs</build_depend>
<build_depend>rosidl_generator_cpp</build_depend> <build_depend>rosidl_runtime_cpp</build_depend>
<build_depend>rosidl_typesupport_c</build_depend> <build_depend>rosidl_typesupport_c</build_depend>
<build_depend>rosidl_typesupport_cpp</build_depend> <build_depend>rosidl_typesupport_cpp</build_depend>
<build_export_depend>builtin_interfaces</build_export_depend> <build_export_depend>builtin_interfaces</build_export_depend>
<build_export_depend>rcl_interfaces</build_export_depend> <build_export_depend>rcl_interfaces</build_export_depend>
<build_export_depend>rosgraph_msgs</build_export_depend> <build_export_depend>rosgraph_msgs</build_export_depend>
<build_export_depend>rosidl_generator_cpp</build_export_depend> <build_export_depend>rosidl_runtime_cpp</build_export_depend>
<build_export_depend>rosidl_typesupport_c</build_export_depend> <build_export_depend>rosidl_typesupport_c</build_export_depend>
<build_export_depend>rosidl_typesupport_cpp</build_export_depend> <build_export_depend>rosidl_typesupport_cpp</build_export_depend>

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_c REQUIRED) find_package(rosidl_runtime_c REQUIRED)
# Default to C++14 # Default to C++14
if(NOT CMAKE_CXX_STANDARD) if(NOT CMAKE_CXX_STANDARD)
@ -33,7 +33,7 @@ ament_target_dependencies(${PROJECT_NAME}
"action_msgs" "action_msgs"
"rcl_action" "rcl_action"
"rclcpp" "rclcpp"
"rosidl_generator_c" "rosidl_runtime_c"
) )
# Causes the visibility macros to use dllexport rather than dllimport, # Causes the visibility macros to use dllexport rather than dllimport,
@ -60,7 +60,7 @@ ament_export_dependencies(ament_cmake)
ament_export_dependencies(action_msgs) 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_runtime_c)
if(BUILD_TESTING) if(BUILD_TESTING)
find_package(ament_cmake_gtest REQUIRED) find_package(ament_cmake_gtest REQUIRED)

View file

@ -9,9 +9,9 @@
<buildtool_depend>ament_cmake_ros</buildtool_depend> <buildtool_depend>ament_cmake_ros</buildtool_depend>
<build_export_depend>rosidl_generator_c</build_export_depend> <build_export_depend>rosidl_runtime_c</build_export_depend>
<build_depend>rosidl_generator_c</build_depend> <build_depend>rosidl_runtime_c</build_depend>
<depend>action_msgs</depend> <depend>action_msgs</depend>
<depend>rclcpp</depend> <depend>rclcpp</depend>