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

Using ament_target_dependencies where possible (#659)

Browse source 
* Modified rclcpp CMakeLists.txt to use ament_target_dependencies

Signed-off-by: ivanpauno <ivanpauno@ekumenlabs.com>

* Modified rclcpp_lifecycle CMakeLists.txt to use ament_target_dependencies

Signed-off-by: ivanpauno <ivanpauno@ekumenlabs.com>

* Corrected with PR comment

Signed-off-by: ivanpauno <ivanpauno@ekumenlabs.com>
This commit is contained in:
ivanpauno 2019-03-19 09:23:10 -03:00 • committed by GitHub
parent 284d0c1c70
commit 2929e4b133
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 109 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

185
rclcpp/CMakeLists.txt
View file

@ -143,70 +143,70 @@ if(BUILD_TESTING)
ament_add_gtest(test_client test/test_client.cpp) ament_add_gtest(test_client test/test_client.cpp)
if(TARGET test_client) if(TARGET test_client)
target_include_directories(test_client PUBLIC ament_target_dependencies(test_client
${rcl_interfaces_INCLUDE_DIRS} "rcl_interfaces"
${rmw_INCLUDE_DIRS} "rmw"
${rosidl_generator_cpp_INCLUDE_DIRS} "rosidl_generator_cpp"
${rosidl_typesupport_cpp_INCLUDE_DIRS} "rosidl_typesupport_cpp"
) )
target_link_libraries(test_client ${PROJECT_NAME}) target_link_libraries(test_client ${PROJECT_NAME})
endif() endif()
ament_add_gtest(test_expand_topic_or_service_name test/test_expand_topic_or_service_name.cpp) ament_add_gtest(test_expand_topic_or_service_name test/test_expand_topic_or_service_name.cpp)
if(TARGET test_expand_topic_or_service_name) if(TARGET test_expand_topic_or_service_name)
target_include_directories(test_expand_topic_or_service_name PUBLIC ament_target_dependencies(test_expand_topic_or_service_name
${rcl_interfaces_INCLUDE_DIRS} "rcl_interfaces"
${rmw_INCLUDE_DIRS} "rmw"
${rosidl_generator_cpp_INCLUDE_DIRS} "rosidl_generator_cpp"
${rosidl_typesupport_cpp_INCLUDE_DIRS} "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})
endif() endif()
ament_add_gtest(test_function_traits test/test_function_traits.cpp) ament_add_gtest(test_function_traits test/test_function_traits.cpp)
if(TARGET test_function_traits) if(TARGET test_function_traits)
target_include_directories(test_function_traits PUBLIC ament_target_dependencies(test_function_traits
${rcl_interfaces_INCLUDE_DIRS} "rcl_interfaces"
${rmw_INCLUDE_DIRS} "rmw"
${rosidl_generator_cpp_INCLUDE_DIRS} "rosidl_generator_cpp"
${rosidl_typesupport_cpp_INCLUDE_DIRS} "rosidl_typesupport_cpp"
) )
endif() endif()
ament_add_gtest(test_mapped_ring_buffer test/test_mapped_ring_buffer.cpp) ament_add_gtest(test_mapped_ring_buffer test/test_mapped_ring_buffer.cpp)
if(TARGET test_mapped_ring_buffer) if(TARGET test_mapped_ring_buffer)
target_include_directories(test_mapped_ring_buffer PUBLIC ament_target_dependencies(test_mapped_ring_buffer
${rcl_INCLUDE_DIRS} "rcl"
${rcl_interfaces_INCLUDE_DIRS} "rcl_interfaces"
${rmw_INCLUDE_DIRS} "rmw"
${rosidl_generator_cpp_INCLUDE_DIRS} "rosidl_generator_cpp"
${rosidl_typesupport_cpp_INCLUDE_DIRS} "rosidl_typesupport_cpp"
) )
endif() endif()
ament_add_gtest(test_intra_process_manager test/test_intra_process_manager.cpp) ament_add_gtest(test_intra_process_manager test/test_intra_process_manager.cpp)
if(TARGET test_intra_process_manager) if(TARGET test_intra_process_manager)
target_include_directories(test_intra_process_manager PUBLIC ament_target_dependencies(test_intra_process_manager
${rcl_INCLUDE_DIRS} "rcl"
${rcl_interfaces_INCLUDE_DIRS} "rcl_interfaces"
${rmw_INCLUDE_DIRS} "rmw"
${rosidl_generator_cpp_INCLUDE_DIRS} "rosidl_generator_cpp"
${rosidl_typesupport_cpp_INCLUDE_DIRS} "rosidl_typesupport_cpp"
) )
endif() endif()
ament_add_gtest(test_node test/test_node.cpp) ament_add_gtest(test_node test/test_node.cpp)
if(TARGET test_node) if(TARGET test_node)
target_include_directories(test_node PUBLIC ament_target_dependencies(test_node
${rcl_interfaces_INCLUDE_DIRS} "rcl_interfaces"
${rmw_INCLUDE_DIRS} "rmw"
${rosidl_generator_cpp_INCLUDE_DIRS} "rosidl_generator_cpp"
${rosidl_typesupport_cpp_INCLUDE_DIRS} "rosidl_typesupport_cpp"
) )
target_link_libraries(test_node ${PROJECT_NAME}) target_link_libraries(test_node ${PROJECT_NAME})
endif() endif()
ament_add_gtest(test_node_global_args test/test_node_global_args.cpp) ament_add_gtest(test_node_global_args test/test_node_global_args.cpp)
if(TARGET test_node_global_args) if(TARGET test_node_global_args)
target_include_directories(test_node_global_args PUBLIC ament_target_dependencies(test_node_global_args
${rcl_interfaces_INCLUDE_DIRS} "rcl_interfaces"
${rmw_INCLUDE_DIRS} "rmw"
${rosidl_generator_cpp_INCLUDE_DIRS} "rosidl_generator_cpp"
${rosidl_typesupport_cpp_INCLUDE_DIRS} "rosidl_typesupport_cpp"
) )
target_link_libraries(test_node_global_args ${PROJECT_NAME}) target_link_libraries(test_node_global_args ${PROJECT_NAME})
endif() endif()
@ -216,21 +216,21 @@ if(BUILD_TESTING)
endif() endif()
ament_add_gtest(test_parameter_events_filter test/test_parameter_events_filter.cpp) ament_add_gtest(test_parameter_events_filter test/test_parameter_events_filter.cpp)
if(TARGET test_parameter_events_filter) if(TARGET test_parameter_events_filter)
target_include_directories(test_parameter_events_filter PUBLIC ament_target_dependencies(test_parameter_events_filter
${rcl_interfaces_INCLUDE_DIRS} "rcl_interfaces"
${rmw_INCLUDE_DIRS} "rmw"
${rosidl_generator_cpp_INCLUDE_DIRS} "rosidl_generator_cpp"
${rosidl_typesupport_cpp_INCLUDE_DIRS} "rosidl_typesupport_cpp"
) )
target_link_libraries(test_parameter_events_filter ${PROJECT_NAME}) target_link_libraries(test_parameter_events_filter ${PROJECT_NAME})
endif() endif()
ament_add_gtest(test_parameter test/test_parameter.cpp) ament_add_gtest(test_parameter test/test_parameter.cpp)
if(TARGET test_parameter) if(TARGET test_parameter)
target_include_directories(test_parameter PUBLIC ament_target_dependencies(test_parameter
${rcl_interfaces_INCLUDE_DIRS} "rcl_interfaces"
${rmw_INCLUDE_DIRS} "rmw"
${rosidl_generator_cpp_INCLUDE_DIRS} "rosidl_generator_cpp"
${rosidl_typesupport_cpp_INCLUDE_DIRS} "rosidl_typesupport_cpp"
) )
target_link_libraries(test_parameter ${PROJECT_NAME}) target_link_libraries(test_parameter ${PROJECT_NAME})
endif() endif()
@ -240,31 +240,31 @@ if(BUILD_TESTING)
endif() endif()
ament_add_gtest(test_publisher test/test_publisher.cpp) ament_add_gtest(test_publisher test/test_publisher.cpp)
if(TARGET test_publisher) if(TARGET test_publisher)
target_include_directories(test_publisher PUBLIC ament_target_dependencies(test_publisher
${rcl_interfaces_INCLUDE_DIRS} "rcl_interfaces"
${rmw_INCLUDE_DIRS} "rmw"
${rosidl_generator_cpp_INCLUDE_DIRS} "rosidl_generator_cpp"
${rosidl_typesupport_cpp_INCLUDE_DIRS} "rosidl_typesupport_cpp"
) )
target_link_libraries(test_publisher ${PROJECT_NAME}) target_link_libraries(test_publisher ${PROJECT_NAME})
endif() endif()
ament_add_gtest(test_publisher_subscription_count_api test/test_publisher_subscription_count_api.cpp) ament_add_gtest(test_publisher_subscription_count_api test/test_publisher_subscription_count_api.cpp)
if(TARGET test_publisher_subscription_count_api) if(TARGET test_publisher_subscription_count_api)
target_include_directories(test_publisher_subscription_count_api PUBLIC ament_target_dependencies(test_publisher_subscription_count_api
${rcl_interfaces_INCLUDE_DIRS} "rcl_interfaces"
${rmw_INCLUDE_DIRS} "rmw"
${rosidl_generator_cpp_INCLUDE_DIRS} "rosidl_generator_cpp"
${rosidl_typesupport_cpp_INCLUDE_DIRS} "rosidl_typesupport_cpp"
) )
target_link_libraries(test_publisher_subscription_count_api ${PROJECT_NAME}) target_link_libraries(test_publisher_subscription_count_api ${PROJECT_NAME})
endif() endif()
ament_add_gtest(test_rate test/test_rate.cpp) ament_add_gtest(test_rate test/test_rate.cpp)
if(TARGET test_rate) if(TARGET test_rate)
target_include_directories(test_rate PUBLIC ament_target_dependencies(test_rate
${rcl_interfaces_INCLUDE_DIRS} "rcl_interfaces"
${rmw_INCLUDE_DIRS} "rmw"
${rosidl_generator_cpp_INCLUDE_DIRS} "rosidl_generator_cpp"
${rosidl_typesupport_cpp_INCLUDE_DIRS} "rosidl_typesupport_cpp"
) )
target_link_libraries(test_rate target_link_libraries(test_rate
${PROJECT_NAME} ${PROJECT_NAME}
@ -272,58 +272,55 @@ if(BUILD_TESTING)
endif() endif()
ament_add_gtest(test_serialized_message_allocator test/test_serialized_message_allocator.cpp) ament_add_gtest(test_serialized_message_allocator test/test_serialized_message_allocator.cpp)
if(TARGET test_serialized_message_allocator) if(TARGET test_serialized_message_allocator)
target_include_directories(test_serialized_message_allocator PUBLIC ament_target_dependencies(test_serialized_message_allocator
${test_msgs_INCLUDE_DIRS} test_msgs
) )
target_link_libraries(test_serialized_message_allocator target_link_libraries(test_serialized_message_allocator
${PROJECT_NAME} ${PROJECT_NAME}
${test_msgs_LIBRARIES}
) )
endif() endif()
ament_add_gtest(test_service test/test_service.cpp) ament_add_gtest(test_service test/test_service.cpp)
if(TARGET test_service) if(TARGET test_service)
target_include_directories(test_service PUBLIC ament_target_dependencies(test_service
${rcl_interfaces_INCLUDE_DIRS} "rcl_interfaces"
${rmw_INCLUDE_DIRS} "rmw"
${rosidl_generator_cpp_INCLUDE_DIRS} "rosidl_generator_cpp"
${rosidl_typesupport_cpp_INCLUDE_DIRS} "rosidl_typesupport_cpp"
) )
target_link_libraries(test_service ${PROJECT_NAME}) target_link_libraries(test_service ${PROJECT_NAME})
endif() endif()
ament_add_gtest(test_subscription test/test_subscription.cpp) ament_add_gtest(test_subscription test/test_subscription.cpp)
if(TARGET test_subscription) if(TARGET test_subscription)
target_include_directories(test_subscription PUBLIC ament_target_dependencies(test_subscription
${rcl_interfaces_INCLUDE_DIRS} "rcl_interfaces"
${rmw_INCLUDE_DIRS} "rmw"
${rosidl_generator_cpp_INCLUDE_DIRS} "rosidl_generator_cpp"
${rosidl_typesupport_cpp_INCLUDE_DIRS} "rosidl_typesupport_cpp"
) )
target_link_libraries(test_subscription ${PROJECT_NAME}) target_link_libraries(test_subscription ${PROJECT_NAME})
endif() endif()
ament_add_gtest(test_subscription_publisher_count_api test/test_subscription_publisher_count_api.cpp) ament_add_gtest(test_subscription_publisher_count_api test/test_subscription_publisher_count_api.cpp)
if(TARGET test_subscription_publisher_count_api) if(TARGET test_subscription_publisher_count_api)
target_include_directories(test_subscription_publisher_count_api PUBLIC ament_target_dependencies(test_subscription_publisher_count_api
${rcl_interfaces_INCLUDE_DIRS} "rcl_interfaces"
${rmw_INCLUDE_DIRS} "rmw"
${rosidl_generator_cpp_INCLUDE_DIRS} "rosidl_generator_cpp"
${rosidl_typesupport_cpp_INCLUDE_DIRS} "rosidl_typesupport_cpp"
) )
target_link_libraries(test_subscription_publisher_count_api ${PROJECT_NAME}) target_link_libraries(test_subscription_publisher_count_api ${PROJECT_NAME})
endif() endif()
find_package(test_msgs REQUIRED) find_package(test_msgs REQUIRED)
ament_add_gtest(test_subscription_traits test/test_subscription_traits.cpp) ament_add_gtest(test_subscription_traits test/test_subscription_traits.cpp)
if(TARGET test_subscription_traits) if(TARGET test_subscription_traits)
target_include_directories(test_subscription_traits PUBLIC ament_target_dependencies(test_subscription_traits
${rcl_INCLUDE_DIRS} "rcl"
"test_msgs"
) )
ament_target_dependencies(test_subscription_traits
"test_msgs"
)
endif() endif()
ament_add_gtest(test_find_weak_nodes test/test_find_weak_nodes.cpp) ament_add_gtest(test_find_weak_nodes test/test_find_weak_nodes.cpp)
if(TARGET test_find_weak_nodes) if(TARGET test_find_weak_nodes)
target_include_directories(test_find_weak_nodes PUBLIC ament_target_dependencies(test_find_weak_nodes
${rcl_INCLUDE_DIRS} "rcl"
) )
target_link_libraries(test_find_weak_nodes ${PROJECT_NAME}) target_link_libraries(test_find_weak_nodes ${PROJECT_NAME})
endif() endif()
@ -347,8 +344,8 @@ if(BUILD_TESTING)
ament_add_gtest(test_externally_defined_services test/test_externally_defined_services.cpp ament_add_gtest(test_externally_defined_services test/test_externally_defined_services.cpp
APPEND_LIBRARY_DIRS "${append_library_dirs}") APPEND_LIBRARY_DIRS "${append_library_dirs}")
if(TARGET test_externally_defined_services) if(TARGET test_externally_defined_services)
target_include_directories(test_externally_defined_services PUBLIC ament_target_dependencies(test_externally_defined_services
${rcl_INCLUDE_DIRS} "rcl"
) )
target_link_libraries(test_externally_defined_services ${PROJECT_NAME}) target_link_libraries(test_externally_defined_services ${PROJECT_NAME})
foreach(typesupport_impl_cpp ${typesupport_impls_cpp}) foreach(typesupport_impl_cpp ${typesupport_impls_cpp})
@ -425,11 +422,11 @@ if(BUILD_TESTING)
ament_add_gtest(test_local_parameters test/test_local_parameters.cpp) ament_add_gtest(test_local_parameters test/test_local_parameters.cpp)
if(TARGET test_local_parameters) if(TARGET test_local_parameters)
target_include_directories(test_local_parameters PUBLIC ament_target_dependencies(test_local_parameters
${rcl_interfaces_INCLUDE_DIRS} "rcl_interfaces"
${rmw_INCLUDE_DIRS} "rmw"
${rosidl_generator_cpp_INCLUDE_DIRS} "rosidl_generator_cpp"
${rosidl_typesupport_cpp_INCLUDE_DIRS} "rosidl_typesupport_cpp"
) )
target_link_libraries(test_local_parameters ${PROJECT_NAME}) target_link_libraries(test_local_parameters ${PROJECT_NAME})
endif() endif()

36
rclcpp_lifecycle/CMakeLists.txt
View file

@ -49,49 +49,49 @@ if(BUILD_TESTING)
ament_add_gtest(test_lifecycle_node test/test_lifecycle_node.cpp) ament_add_gtest(test_lifecycle_node test/test_lifecycle_node.cpp)
if(TARGET test_lifecycle_node) if(TARGET test_lifecycle_node)
target_include_directories(test_lifecycle_node PUBLIC ament_target_dependencies(test_lifecycle_node
${rcl_lifecycle_INCLUDE_DIRS} "rcl_lifecycle"
${rclcpp_INCLUDE_DIRS} "rclcpp"
) )
target_link_libraries(test_lifecycle_node ${PROJECT_NAME}) target_link_libraries(test_lifecycle_node ${PROJECT_NAME})
endif() endif()
ament_add_gtest(test_state_machine_info test/test_state_machine_info.cpp) ament_add_gtest(test_state_machine_info test/test_state_machine_info.cpp)
if(TARGET test_state_machine_info) if(TARGET test_state_machine_info)
target_include_directories(test_state_machine_info PUBLIC ament_target_dependencies(test_state_machine_info
${rcl_lifecycle_INCLUDE_DIRS} "rcl_lifecycle"
${rclcpp_INCLUDE_DIRS} "rclcpp"
) )
target_link_libraries(test_state_machine_info ${PROJECT_NAME}) target_link_libraries(test_state_machine_info ${PROJECT_NAME})
endif() endif()
ament_add_gtest(test_register_custom_callbacks test/test_register_custom_callbacks.cpp) ament_add_gtest(test_register_custom_callbacks test/test_register_custom_callbacks.cpp)
if(TARGET test_register_custom_callbacks) if(TARGET test_register_custom_callbacks)
target_include_directories(test_register_custom_callbacks PUBLIC ament_target_dependencies(test_register_custom_callbacks
${rcl_lifecycle_INCLUDE_DIRS} "rcl_lifecycle"
${rclcpp_INCLUDE_DIRS} "rclcpp"
) )
target_link_libraries(test_register_custom_callbacks ${PROJECT_NAME}) target_link_libraries(test_register_custom_callbacks ${PROJECT_NAME})
endif() endif()
ament_add_gtest(test_callback_exceptions test/test_callback_exceptions.cpp) ament_add_gtest(test_callback_exceptions test/test_callback_exceptions.cpp)
if(TARGET test_callback_exceptions) if(TARGET test_callback_exceptions)
target_include_directories(test_callback_exceptions PUBLIC ament_target_dependencies(test_callback_exceptions
${rcl_lifecycle_INCLUDE_DIRS} "rcl_lifecycle"
${rclcpp_INCLUDE_DIRS} "rclcpp"
) )
target_link_libraries(test_callback_exceptions ${PROJECT_NAME}) target_link_libraries(test_callback_exceptions ${PROJECT_NAME})
endif() endif()
ament_add_gtest(test_state_wrapper test/test_state_wrapper.cpp) ament_add_gtest(test_state_wrapper test/test_state_wrapper.cpp)
if(TARGET test_state_wrapper) if(TARGET test_state_wrapper)
target_include_directories(test_state_wrapper PUBLIC ament_target_dependencies(test_state_wrapper
${rcl_lifecycle_INCLUDE_DIRS} "rcl_lifecycle"
${rclcpp_INCLUDE_DIRS} "rclcpp"
) )
target_link_libraries(test_state_wrapper ${PROJECT_NAME}) target_link_libraries(test_state_wrapper ${PROJECT_NAME})
endif() endif()
ament_add_gtest(test_transition_wrapper test/test_transition_wrapper.cpp) ament_add_gtest(test_transition_wrapper test/test_transition_wrapper.cpp)
if(TARGET test_transition_wrapper) if(TARGET test_transition_wrapper)
target_include_directories(test_transition_wrapper PUBLIC ament_target_dependencies(test_transition_wrapper
${rcl_lifecycle_INCLUDE_DIRS} "rcl_lifecycle"
${rclcpp_INCLUDE_DIRS} "rclcpp"
) )
target_link_libraries(test_transition_wrapper ${PROJECT_NAME}) target_link_libraries(test_transition_wrapper ${PROJECT_NAME})
endif() endif()