i/OrbbecSDK_ROS2
1
0
Fork 0
mirror of https://github.com/orbbec/OrbbecSDK_ROS2.git synced 2026-10-04 20:17:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #101 from mul-cps/fix_deps

Browse Source 
fix dependencies
This commit is contained in:
jjiszjj
2025-04-29 16:37:15 +08:00
committed by GitHub
parent c0178bcc64 e2216b306a
commit 10e07e6d70
6 changed files with 11 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
orbbec_camera/CMakeLists.txt
-6
View File
@@ -15,12 +15,6 @@ option(USE_NV_HW_DECODER "Use Nvidia hardware decoder" OFF)
if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Werror -Wno-pedantic -Wno-array-bounds)
endif ()
# Check if ROS Jazzy or iron is installed
if ("$ENV{ROS_DISTRO}" STREQUAL "jazzy")
add_compile_definitions(ROS_JAZZY)
elseif ("$ENV{ROS_DISTRO}" STREQUAL "iron")
add_compile_definitions(ROS_IRON)
endif ()
# find dependencies
set(dependencies
orbbec_camera/include/orbbec_camera/ob_camera_node.h
+2 -2
View File
@@ -64,9 +64,9 @@
#include "jpeg_decoder.h"
#include <std_msgs/msg/string.hpp>
#if defined(ROS_JAZZY) || defined(ROS_IRON)
#if __has_include(<cv_bridge/cv_bridge.hpp>)
#include <cv_bridge/cv_bridge.hpp>
#else
#elif __has_include(<cv_bridge/cv_bridge.h>)
#include <cv_bridge/cv_bridge.h>
#endif
orbbec_camera/include/orbbec_camera/ros_param_backend.h
+5 -7
View File
@@ -22,13 +22,11 @@ class ParametersBackend {
public:
explicit ParametersBackend(rclcpp::Node* node);
~ParametersBackend();
#if defined(ROS_JAZZY) || defined(ROS_IRON)
void addOnSetParametersCallback(
rclcpp::node_interfaces::NodeParametersInterface::OnSetParametersCallbackType callback);
#else
void addOnSetParametersCallback(
rclcpp::node_interfaces::NodeParametersInterface::OnParametersSetCallbackType callback);
#endif
template <typename T>
void addOnSetParametersCallback(T callback) {
ros_callback_ = node_->add_on_set_parameters_callback(callback);
}
private:
rclcpp::Node* node_;
orbbec_camera/package.xml
+2
View File
@@ -25,6 +25,7 @@
<depend>std_srvs</depend>
<depend>statistics_msgs</depend>
<depend>tf2</depend>
<depend>tf2_eigen</depend>
<depend>tf2_ros</depend>
<depend>tf2_sensor_msgs</depend>
<depend>tf2_msgs</depend>
@@ -34,6 +35,7 @@
<depend>nlohmann-json-dev</depend>
<depend>libgoogle-glog-dev</depend>
<depend>libdw-dev</depend>
<depend>opengl</depend>
<export>
<build_type>ament_cmake</build_type>
</export>
orbbec_camera/src/d2c_viewer.cpp
+2 -2
View File
@@ -14,9 +14,9 @@
* limitations under the License.
*******************************************************************************/
#if defined(ROS_JAZZY) || defined(ROS_IRON)
#if __has_include(<cv_bridge/cv_bridge.hpp>)
#include <cv_bridge/cv_bridge.hpp>
#else
#elif __has_include(<cv_bridge/cv_bridge.h>)
#include <cv_bridge/cv_bridge.h>
#endif
#include <sensor_msgs/image_encodings.hpp>
orbbec_camera/src/ros_param_backend.cpp
-11
View File
@@ -26,16 +26,5 @@ ParametersBackend::~ParametersBackend() {
ros_callback_.reset();
}
}
#if defined(ROS_JAZZY) || defined(ROS_IRON)
void ParametersBackend::addOnSetParametersCallback(
rclcpp::node_interfaces::NodeParametersInterface::OnSetParametersCallbackType callback) {
ros_callback_ = node_->add_on_set_parameters_callback(callback);
}
#else
void ParametersBackend::addOnSetParametersCallback(
rclcpp::node_interfaces::NodeParametersInterface::OnParametersSetCallbackType callback) {
ros_callback_ = node_->add_on_set_parameters_callback(callback);
}
#endif
} // namespace orbbec_camera