From 2929e4b1338d854712e04bbdb12e5146963cef75 Mon Sep 17 00:00:00 2001 From: ivanpauno Date: Tue, 19 Mar 2019 09:23:10 -0300 Subject: [PATCH] Using ament_target_dependencies where possible (#659) * Modified rclcpp CMakeLists.txt to use ament_target_dependencies Signed-off-by: ivanpauno * Modified rclcpp_lifecycle CMakeLists.txt to use ament_target_dependencies Signed-off-by: ivanpauno * Corrected with PR comment Signed-off-by: ivanpauno --- rclcpp/CMakeLists.txt | 185 ++++++++++++++++---------------- rclcpp_lifecycle/CMakeLists.txt | 36 +++---- 2 files changed, 109 insertions(+), 112 deletions(-) diff --git a/rclcpp/CMakeLists.txt b/rclcpp/CMakeLists.txt index 149d49f..df866a9 100644 --- a/rclcpp/CMakeLists.txt +++ b/rclcpp/CMakeLists.txt @@ -143,70 +143,70 @@ if(BUILD_TESTING) ament_add_gtest(test_client test/test_client.cpp) if(TARGET test_client) - target_include_directories(test_client PUBLIC - ${rcl_interfaces_INCLUDE_DIRS} - ${rmw_INCLUDE_DIRS} - ${rosidl_generator_cpp_INCLUDE_DIRS} - ${rosidl_typesupport_cpp_INCLUDE_DIRS} + ament_target_dependencies(test_client + "rcl_interfaces" + "rmw" + "rosidl_generator_cpp" + "rosidl_typesupport_cpp" ) target_link_libraries(test_client ${PROJECT_NAME}) endif() 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) - target_include_directories(test_expand_topic_or_service_name PUBLIC - ${rcl_interfaces_INCLUDE_DIRS} - ${rmw_INCLUDE_DIRS} - ${rosidl_generator_cpp_INCLUDE_DIRS} - ${rosidl_typesupport_cpp_INCLUDE_DIRS} + ament_target_dependencies(test_expand_topic_or_service_name + "rcl_interfaces" + "rmw" + "rosidl_generator_cpp" + "rosidl_typesupport_cpp" ) target_link_libraries(test_expand_topic_or_service_name ${PROJECT_NAME}) endif() ament_add_gtest(test_function_traits test/test_function_traits.cpp) if(TARGET test_function_traits) - target_include_directories(test_function_traits PUBLIC - ${rcl_interfaces_INCLUDE_DIRS} - ${rmw_INCLUDE_DIRS} - ${rosidl_generator_cpp_INCLUDE_DIRS} - ${rosidl_typesupport_cpp_INCLUDE_DIRS} + ament_target_dependencies(test_function_traits + "rcl_interfaces" + "rmw" + "rosidl_generator_cpp" + "rosidl_typesupport_cpp" ) endif() ament_add_gtest(test_mapped_ring_buffer test/test_mapped_ring_buffer.cpp) if(TARGET test_mapped_ring_buffer) - target_include_directories(test_mapped_ring_buffer PUBLIC - ${rcl_INCLUDE_DIRS} - ${rcl_interfaces_INCLUDE_DIRS} - ${rmw_INCLUDE_DIRS} - ${rosidl_generator_cpp_INCLUDE_DIRS} - ${rosidl_typesupport_cpp_INCLUDE_DIRS} + ament_target_dependencies(test_mapped_ring_buffer + "rcl" + "rcl_interfaces" + "rmw" + "rosidl_generator_cpp" + "rosidl_typesupport_cpp" ) endif() ament_add_gtest(test_intra_process_manager test/test_intra_process_manager.cpp) if(TARGET test_intra_process_manager) - target_include_directories(test_intra_process_manager PUBLIC - ${rcl_INCLUDE_DIRS} - ${rcl_interfaces_INCLUDE_DIRS} - ${rmw_INCLUDE_DIRS} - ${rosidl_generator_cpp_INCLUDE_DIRS} - ${rosidl_typesupport_cpp_INCLUDE_DIRS} + ament_target_dependencies(test_intra_process_manager + "rcl" + "rcl_interfaces" + "rmw" + "rosidl_generator_cpp" + "rosidl_typesupport_cpp" ) endif() ament_add_gtest(test_node test/test_node.cpp) if(TARGET test_node) - target_include_directories(test_node PUBLIC - ${rcl_interfaces_INCLUDE_DIRS} - ${rmw_INCLUDE_DIRS} - ${rosidl_generator_cpp_INCLUDE_DIRS} - ${rosidl_typesupport_cpp_INCLUDE_DIRS} + ament_target_dependencies(test_node + "rcl_interfaces" + "rmw" + "rosidl_generator_cpp" + "rosidl_typesupport_cpp" ) target_link_libraries(test_node ${PROJECT_NAME}) endif() ament_add_gtest(test_node_global_args test/test_node_global_args.cpp) if(TARGET test_node_global_args) - target_include_directories(test_node_global_args PUBLIC - ${rcl_interfaces_INCLUDE_DIRS} - ${rmw_INCLUDE_DIRS} - ${rosidl_generator_cpp_INCLUDE_DIRS} - ${rosidl_typesupport_cpp_INCLUDE_DIRS} + ament_target_dependencies(test_node_global_args + "rcl_interfaces" + "rmw" + "rosidl_generator_cpp" + "rosidl_typesupport_cpp" ) target_link_libraries(test_node_global_args ${PROJECT_NAME}) endif() @@ -216,21 +216,21 @@ if(BUILD_TESTING) endif() ament_add_gtest(test_parameter_events_filter test/test_parameter_events_filter.cpp) if(TARGET test_parameter_events_filter) - target_include_directories(test_parameter_events_filter PUBLIC - ${rcl_interfaces_INCLUDE_DIRS} - ${rmw_INCLUDE_DIRS} - ${rosidl_generator_cpp_INCLUDE_DIRS} - ${rosidl_typesupport_cpp_INCLUDE_DIRS} + ament_target_dependencies(test_parameter_events_filter + "rcl_interfaces" + "rmw" + "rosidl_generator_cpp" + "rosidl_typesupport_cpp" ) target_link_libraries(test_parameter_events_filter ${PROJECT_NAME}) endif() ament_add_gtest(test_parameter test/test_parameter.cpp) if(TARGET test_parameter) - target_include_directories(test_parameter PUBLIC - ${rcl_interfaces_INCLUDE_DIRS} - ${rmw_INCLUDE_DIRS} - ${rosidl_generator_cpp_INCLUDE_DIRS} - ${rosidl_typesupport_cpp_INCLUDE_DIRS} + ament_target_dependencies(test_parameter + "rcl_interfaces" + "rmw" + "rosidl_generator_cpp" + "rosidl_typesupport_cpp" ) target_link_libraries(test_parameter ${PROJECT_NAME}) endif() @@ -240,31 +240,31 @@ if(BUILD_TESTING) endif() ament_add_gtest(test_publisher test/test_publisher.cpp) if(TARGET test_publisher) - target_include_directories(test_publisher PUBLIC - ${rcl_interfaces_INCLUDE_DIRS} - ${rmw_INCLUDE_DIRS} - ${rosidl_generator_cpp_INCLUDE_DIRS} - ${rosidl_typesupport_cpp_INCLUDE_DIRS} + ament_target_dependencies(test_publisher + "rcl_interfaces" + "rmw" + "rosidl_generator_cpp" + "rosidl_typesupport_cpp" ) target_link_libraries(test_publisher ${PROJECT_NAME}) endif() ament_add_gtest(test_publisher_subscription_count_api test/test_publisher_subscription_count_api.cpp) if(TARGET test_publisher_subscription_count_api) - target_include_directories(test_publisher_subscription_count_api PUBLIC - ${rcl_interfaces_INCLUDE_DIRS} - ${rmw_INCLUDE_DIRS} - ${rosidl_generator_cpp_INCLUDE_DIRS} - ${rosidl_typesupport_cpp_INCLUDE_DIRS} + ament_target_dependencies(test_publisher_subscription_count_api + "rcl_interfaces" + "rmw" + "rosidl_generator_cpp" + "rosidl_typesupport_cpp" ) target_link_libraries(test_publisher_subscription_count_api ${PROJECT_NAME}) endif() ament_add_gtest(test_rate test/test_rate.cpp) if(TARGET test_rate) - target_include_directories(test_rate PUBLIC - ${rcl_interfaces_INCLUDE_DIRS} - ${rmw_INCLUDE_DIRS} - ${rosidl_generator_cpp_INCLUDE_DIRS} - ${rosidl_typesupport_cpp_INCLUDE_DIRS} + ament_target_dependencies(test_rate + "rcl_interfaces" + "rmw" + "rosidl_generator_cpp" + "rosidl_typesupport_cpp" ) target_link_libraries(test_rate ${PROJECT_NAME} @@ -272,58 +272,55 @@ if(BUILD_TESTING) endif() ament_add_gtest(test_serialized_message_allocator test/test_serialized_message_allocator.cpp) if(TARGET test_serialized_message_allocator) - target_include_directories(test_serialized_message_allocator PUBLIC - ${test_msgs_INCLUDE_DIRS} + ament_target_dependencies(test_serialized_message_allocator + test_msgs ) target_link_libraries(test_serialized_message_allocator ${PROJECT_NAME} - ${test_msgs_LIBRARIES} ) endif() ament_add_gtest(test_service test/test_service.cpp) if(TARGET test_service) - target_include_directories(test_service PUBLIC - ${rcl_interfaces_INCLUDE_DIRS} - ${rmw_INCLUDE_DIRS} - ${rosidl_generator_cpp_INCLUDE_DIRS} - ${rosidl_typesupport_cpp_INCLUDE_DIRS} + ament_target_dependencies(test_service + "rcl_interfaces" + "rmw" + "rosidl_generator_cpp" + "rosidl_typesupport_cpp" ) target_link_libraries(test_service ${PROJECT_NAME}) endif() ament_add_gtest(test_subscription test/test_subscription.cpp) if(TARGET test_subscription) - target_include_directories(test_subscription PUBLIC - ${rcl_interfaces_INCLUDE_DIRS} - ${rmw_INCLUDE_DIRS} - ${rosidl_generator_cpp_INCLUDE_DIRS} - ${rosidl_typesupport_cpp_INCLUDE_DIRS} + ament_target_dependencies(test_subscription + "rcl_interfaces" + "rmw" + "rosidl_generator_cpp" + "rosidl_typesupport_cpp" ) target_link_libraries(test_subscription ${PROJECT_NAME}) endif() ament_add_gtest(test_subscription_publisher_count_api test/test_subscription_publisher_count_api.cpp) if(TARGET test_subscription_publisher_count_api) - target_include_directories(test_subscription_publisher_count_api PUBLIC - ${rcl_interfaces_INCLUDE_DIRS} - ${rmw_INCLUDE_DIRS} - ${rosidl_generator_cpp_INCLUDE_DIRS} - ${rosidl_typesupport_cpp_INCLUDE_DIRS} + ament_target_dependencies(test_subscription_publisher_count_api + "rcl_interfaces" + "rmw" + "rosidl_generator_cpp" + "rosidl_typesupport_cpp" ) target_link_libraries(test_subscription_publisher_count_api ${PROJECT_NAME}) endif() find_package(test_msgs REQUIRED) ament_add_gtest(test_subscription_traits test/test_subscription_traits.cpp) if(TARGET test_subscription_traits) - target_include_directories(test_subscription_traits PUBLIC - ${rcl_INCLUDE_DIRS} + ament_target_dependencies(test_subscription_traits + "rcl" + "test_msgs" ) - ament_target_dependencies(test_subscription_traits - "test_msgs" - ) endif() ament_add_gtest(test_find_weak_nodes test/test_find_weak_nodes.cpp) if(TARGET test_find_weak_nodes) - target_include_directories(test_find_weak_nodes PUBLIC - ${rcl_INCLUDE_DIRS} + ament_target_dependencies(test_find_weak_nodes + "rcl" ) target_link_libraries(test_find_weak_nodes ${PROJECT_NAME}) endif() @@ -347,8 +344,8 @@ if(BUILD_TESTING) ament_add_gtest(test_externally_defined_services test/test_externally_defined_services.cpp APPEND_LIBRARY_DIRS "${append_library_dirs}") if(TARGET test_externally_defined_services) - target_include_directories(test_externally_defined_services PUBLIC - ${rcl_INCLUDE_DIRS} + ament_target_dependencies(test_externally_defined_services + "rcl" ) target_link_libraries(test_externally_defined_services ${PROJECT_NAME}) 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) if(TARGET test_local_parameters) - target_include_directories(test_local_parameters PUBLIC - ${rcl_interfaces_INCLUDE_DIRS} - ${rmw_INCLUDE_DIRS} - ${rosidl_generator_cpp_INCLUDE_DIRS} - ${rosidl_typesupport_cpp_INCLUDE_DIRS} + ament_target_dependencies(test_local_parameters + "rcl_interfaces" + "rmw" + "rosidl_generator_cpp" + "rosidl_typesupport_cpp" ) target_link_libraries(test_local_parameters ${PROJECT_NAME}) endif() diff --git a/rclcpp_lifecycle/CMakeLists.txt b/rclcpp_lifecycle/CMakeLists.txt index 10bc512..373667a 100644 --- a/rclcpp_lifecycle/CMakeLists.txt +++ b/rclcpp_lifecycle/CMakeLists.txt @@ -49,49 +49,49 @@ if(BUILD_TESTING) ament_add_gtest(test_lifecycle_node test/test_lifecycle_node.cpp) if(TARGET test_lifecycle_node) - target_include_directories(test_lifecycle_node PUBLIC - ${rcl_lifecycle_INCLUDE_DIRS} - ${rclcpp_INCLUDE_DIRS} + ament_target_dependencies(test_lifecycle_node + "rcl_lifecycle" + "rclcpp" ) target_link_libraries(test_lifecycle_node ${PROJECT_NAME}) endif() ament_add_gtest(test_state_machine_info test/test_state_machine_info.cpp) if(TARGET test_state_machine_info) - target_include_directories(test_state_machine_info PUBLIC - ${rcl_lifecycle_INCLUDE_DIRS} - ${rclcpp_INCLUDE_DIRS} + ament_target_dependencies(test_state_machine_info + "rcl_lifecycle" + "rclcpp" ) target_link_libraries(test_state_machine_info ${PROJECT_NAME}) endif() ament_add_gtest(test_register_custom_callbacks test/test_register_custom_callbacks.cpp) if(TARGET test_register_custom_callbacks) - target_include_directories(test_register_custom_callbacks PUBLIC - ${rcl_lifecycle_INCLUDE_DIRS} - ${rclcpp_INCLUDE_DIRS} + ament_target_dependencies(test_register_custom_callbacks + "rcl_lifecycle" + "rclcpp" ) target_link_libraries(test_register_custom_callbacks ${PROJECT_NAME}) endif() ament_add_gtest(test_callback_exceptions test/test_callback_exceptions.cpp) if(TARGET test_callback_exceptions) - target_include_directories(test_callback_exceptions PUBLIC - ${rcl_lifecycle_INCLUDE_DIRS} - ${rclcpp_INCLUDE_DIRS} + ament_target_dependencies(test_callback_exceptions + "rcl_lifecycle" + "rclcpp" ) target_link_libraries(test_callback_exceptions ${PROJECT_NAME}) endif() ament_add_gtest(test_state_wrapper test/test_state_wrapper.cpp) if(TARGET test_state_wrapper) - target_include_directories(test_state_wrapper PUBLIC - ${rcl_lifecycle_INCLUDE_DIRS} - ${rclcpp_INCLUDE_DIRS} + ament_target_dependencies(test_state_wrapper + "rcl_lifecycle" + "rclcpp" ) target_link_libraries(test_state_wrapper ${PROJECT_NAME}) endif() ament_add_gtest(test_transition_wrapper test/test_transition_wrapper.cpp) if(TARGET test_transition_wrapper) - target_include_directories(test_transition_wrapper PUBLIC - ${rcl_lifecycle_INCLUDE_DIRS} - ${rclcpp_INCLUDE_DIRS} + ament_target_dependencies(test_transition_wrapper + "rcl_lifecycle" + "rclcpp" ) target_link_libraries(test_transition_wrapper ${PROJECT_NAME}) endif()