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

hpp include compatibility for jazzy/rolling #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

hpp include compatibility for jazzy/rolling #3

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
a0a94e4
update headers to hpp for jazzy/rolling
J-C-Haley Jan 31, 2025
e961bfa
makes hpp vs h optional
J-C-Haley Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ find_package(rclcpp REQUIRED)
find_package(image_transport REQUIRED)
find_package(cv_bridge REQUIRED)
find_package(std_msgs REQUIRED)
find_package(cv_bridge REQUIRED)
find_package(camera_info_manager REQUIRED)
# find_package(roslint REQUIRED)
find_package(builtin_interfaces REQUIRED)
Expand All @@ -50,23 +49,23 @@ target_link_libraries(cv_camera_node ${Boost_LIBRARIES} cv_camera)

## Specify libraries to link a library or executable target against
ament_target_dependencies(cv_camera
"rclcpp"
"sensor_msgs"
"image_transport"
"cv_bridge"
"camera_info_manager"
"std_msgs"
"OpenCV"
rclcpp
sensor_msgs
image_transport
cv_bridge
camera_info_manager
std_msgs
OpenCV
)

ament_target_dependencies(cv_camera_node
"rclcpp"
"sensor_msgs"
"std_msgs"
"OpenCV"
"camera_info_manager"
"image_transport"
"cv_bridge"
rclcpp
sensor_msgs
std_msgs
OpenCV
camera_info_manager
image_transport
cv_bridge
)

#############
Expand Down
19 changes: 17 additions & 2 deletions include/cv_camera/capture.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,27 @@
#include <string>

#include <rclcpp/rclcpp.hpp>
#include <cv_bridge/cv_bridge.h>
#include <image_transport/image_transport.h>
#include <sensor_msgs/msg/camera_info.hpp>
#include <sensor_msgs/image_encodings.hpp>
#include <opencv2/highgui/highgui.hpp>

#if __has_include(<cv_bridge/cv_bridge.hpp>)
#include <cv_bridge/cv_bridge.hpp>
#else
#include <cv_bridge/cv_bridge.h>
#endif

#if __has_include(<image_transport/image_transport.hpp>)
#include <image_transport/image_transport.hpp>
#else
#include <image_transport/image_transport.h>
#endif

#if __has_include(<camera_info_manager/camera_info_manager.hpp>)
#include <camera_info_manager/camera_info_manager.hpp>
#else
#include <camera_info_manager/camera_info_manager.h>
#endif

/**
* @brief namespace of this package
Expand Down