From 4acab909aab990da3b1842541c8ed51f8dd8e6e3 Mon Sep 17 00:00:00 2001 From: Karsten Knese Date: Wed, 17 Jun 2020 15:24:10 -0700 Subject: [PATCH] export shared_queues_vendor (#434) (#438) * export shared_queues_vendor Signed-off-by: Knese Karsten * Revert "find rosbag2_cpp (tinyxml2) before rcl (#423)" This reverts commit 48fd15e7c249b904d9b4bec4bfcb8e12f02c7b3a. Signed-off-by: Karsten Knese --- rosbag2_transport/CMakeLists.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/rosbag2_transport/CMakeLists.txt b/rosbag2_transport/CMakeLists.txt index 05c3a1c6b4..e6618845c6 100644 --- a/rosbag2_transport/CMakeLists.txt +++ b/rosbag2_transport/CMakeLists.txt @@ -22,14 +22,12 @@ endif() find_package(ament_cmake REQUIRED) find_package(ament_cmake_ros REQUIRED) -# TODO(Karsten1987) rosbag2_cpp has to be found first here -# See https://github.com/ros2/ros2/issues/927 -find_package(rosbag2_cpp REQUIRED) find_package(rcl REQUIRED) find_package(rclcpp REQUIRED) find_package(rcutils REQUIRED) find_package(rmw REQUIRED) find_package(rosbag2_compression REQUIRED) +find_package(rosbag2_cpp REQUIRED) find_package(rmw_implementation_cmake REQUIRED) find_package(shared_queues_vendor REQUIRED) find_package(yaml_cpp_vendor REQUIRED) @@ -46,7 +44,6 @@ add_library(${PROJECT_NAME} SHARED target_include_directories(${PROJECT_NAME} PUBLIC $ $) - ament_target_dependencies(${PROJECT_NAME} rcl rclcpp @@ -85,7 +82,7 @@ install( ament_export_include_directories(include) ament_export_libraries(${PROJECT_NAME}) ament_export_targets(export_${PROJECT_NAME}) -ament_export_dependencies(rosbag2_cpp rosbag2_compression yaml_cpp_vendor) +ament_export_dependencies(rosbag2_cpp rosbag2_compression shared_queues_vendor yaml_cpp_vendor) function(create_tests_for_rmw_implementation) rosbag2_transport_add_gmock(test_info