Skip to content

[ROS-O] support modern system dependencies #74

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

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

[ROS-O] support modern system dependencies #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
59c38f3
do away with boost::bind
v4hn Oct 20, 2022
2b187b0
adapt pluginlib header
v4hn Oct 20, 2022
f63727a
support modern libuvc cmake target
v4hn Jun 26, 2024
a427699
Fix dependency on libuvc-dev
rhaschke Jan 9, 2025
3b2bbc6
Add missing dependency on libusb-1.0-dev
rhaschke Jan 9, 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
8 changes: 7 additions & 1 deletion libuvc_camera/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@ find_package(catkin REQUIRED COMPONENTS roscpp camera_info_manager dynamic_recon
generate_dynamic_reconfigure_options(cfg/UVCCamera.cfg)

find_package(libuvc REQUIRED)
message(STATUS "libuvc ${libuvc_VERSION_MAJOR}.${libuvc_VERSION_MINOR}.${libuvc_VERSION_PATCH}")
# if libuvc_LIBRARIES are empty, check cmake target
if(NOT libuvc_LIBRARIES AND TARGET LibUVC::UVCShared)
set(libuvc_LIBRARIES LibUVC::UVCShared)
endif()
if(NOT libuvc_LIBRARIES)
message(FATAL_ERROR "could not find expected libuvc libraries in package")
endif()

catkin_package(
CATKIN_DEPENDS
Expand Down
4 changes: 2 additions & 2 deletions libuvc_camera/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<depend>camera_info_manager</depend>
<depend>dynamic_reconfigure</depend>
<depend>image_transport</depend>
<depend condition="$ROS_DISTRO != noetic">libuvc</depend>
<depend condition="$ROS_DISTRO == noetic">libuvc-dev</depend>
<depend>libuvc-dev</depend>
<depend>libusb-1.0-dev</depend>
<depend>nodelet</depend>
<depend>sensor_msgs</depend>

Expand Down
2 changes: 1 addition & 1 deletion libuvc_camera/src/camera_driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ bool CameraDriver::Start() {

state_ = kStopped;

config_server_.setCallback(boost::bind(&CameraDriver::ReconfigureCallback, this, _1, _2));
config_server_.setCallback([this](auto& config, auto level){ ReconfigureCallback(config, level); });

return state_ == kRunning;
}
Expand Down
2 changes: 1 addition & 1 deletion libuvc_camera/src/nodelet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*********************************************************************/
#include <ros/ros.h>
#include <pluginlib/class_list_macros.h>
#include <pluginlib/class_list_macros.hpp>
#include <nodelet/nodelet.h>

#include "libuvc_camera/camera_driver.h"
Expand Down