Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ros2] Port video plugin to ros2 #899

Merged
merged 2 commits into from May 21, 2019
Merged

[ros2] Port video plugin to ros2 #899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfac88f
[ros2] Port video plugin to ros2
shiveshkhaitan Mar 14, 2019
b2c2f1d
Fix test for gazebo_ros_video
shiveshkhaitan May 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
100 changes: 0 additions & 100 deletions .ros1_unported/gazebo_plugins/include/gazebo_plugins/gazebo_ros_video.h
View file
Open in desktop

This file was deleted.

254 changes: 0 additions & 254 deletions .ros1_unported/gazebo_plugins/src/gazebo_ros_video.cpp
View file
Open in desktop

This file was deleted.

14 changes: 14 additions & 0 deletions gazebo_plugins/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -17,6 +17,7 @@ find_package(gazebo_dev REQUIRED)
find_package(gazebo_ros REQUIRED)
find_package(geometry_msgs REQUIRED)
find_package(image_transport REQUIRED)
find_package(cv_bridge REQUIRED)
find_package(nav_msgs REQUIRED)
find_package(rclcpp REQUIRED)
find_package(sensor_msgs REQUIRED)
Expand All @@ -30,6 +31,7 @@ include_directories(include
${gazebo_ros_INCLUDE_DIRS}
${geometry_msgs_INCLUDE_DIRS}
${image_transport_INCLUDE_DIRS}
${cv_bridge_INCLUDE_DIRS}
${nav_msgs_INCLUDE_DIRS}
${sensor_msgs_INCLUDE_DIRS}
${tf2_ros_INCLUDE_DIRS}
Expand Down Expand Up @@ -145,6 +147,17 @@ ament_target_dependencies(gazebo_ros_p3d
)
ament_export_libraries(gazebo_ros_p3d)

# gazebo_ros_video
add_library(gazebo_ros_video SHARED
src/gazebo_ros_video.cpp
)
ament_target_dependencies(gazebo_ros_video
"gazebo_ros"
"sensor_msgs"
"cv_bridge"
)
ament_export_libraries(gazebo_ros_video)

ament_export_include_directories(include)
ament_export_dependencies(rclcpp)
ament_export_dependencies(gazebo_dev)
Expand All @@ -170,6 +183,7 @@ install(TARGETS
gazebo_ros_ray_sensor
gazebo_ros_p3d
gazebo_ros_template
gazebo_ros_video
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
RUNTIME DESTINATION bin)
Expand Down