Skip to content

Commit

Permalink
export shared_queues_vendor (#434) (#438)
Browse files Browse the repository at this point in the history
* export shared_queues_vendor

Signed-off-by: Knese Karsten <karsten@openrobotics.org>

* Revert "find rosbag2_cpp (tinyxml2) before rcl (#423)"

This reverts commit 48fd15e.

Signed-off-by: Karsten Knese <karsten@openrobotics.org>
  • Loading branch information
Karsten1987 authored Jun 17, 2020
1 parent 70b79ba commit 4acab90
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions rosbag2_transport/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -46,7 +44,6 @@ add_library(${PROJECT_NAME} SHARED
target_include_directories(${PROJECT_NAME} PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>)

ament_target_dependencies(${PROJECT_NAME}
rcl
rclcpp
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 4acab90

Please sign in to comment.