diff --git a/libuvc_camera/CMakeLists.txt b/libuvc_camera/CMakeLists.txt index d8f2b884426403092edab5d2e6d09cdffa2f3c5b..8296dd056638b0967c6b855e917c32e63ed5a4ee 100644 --- a/libuvc_camera/CMakeLists.txt +++ b/libuvc_camera/CMakeLists.txt @@ -6,7 +6,8 @@ find_package(catkin REQUIRED COMPONENTS roscpp camera_info_manager driver_base d generate_dynamic_reconfigure_options(cfg/UVCCamera.cfg) -#find_package(libuvc REQUIRED) +find_package(libuvc REQUIRED) + catkin_package( CATKIN_DEPENDS roscpp @@ -19,21 +20,21 @@ catkin_package( LIBRARIES libuvc_camera_nodelet ) -include_directories(include ${Boost_INCLUDE_DIR} ${catkin_INCLUDE_DIRS}) +include_directories(include ${Boost_INCLUDE_DIR} ${catkin_INCLUDE_DIRS} ${libuvc_INCLUDE_DIRS}) link_directories(${catkin_LINK_DIRS}) find_package(Boost REQUIRED COMPONENTS thread) include_directories(${Boost_INCLUDE_DIRS}) add_executable(camera_node src/main.cpp src/camera_driver.cpp) -target_link_libraries(camera_node uvc ${Boost_LIBRARIES} ${catkin_LIBRARIES}) +target_link_libraries(camera_node ${Boost_LIBRARIES} ${catkin_LIBRARIES} ${libuvc_LIBRARIES}) add_library(libuvc_camera_nodelet src/nodelet.cpp src/camera_driver.cpp) add_dependencies(libuvc_camera_nodelet ${libuvc_camera_EXPORTED_TARGETS}) -target_link_libraries(libuvc_camera_nodelet uvc ${Boost_LIBRARIES} ${catkin_LIBRARIES}) +target_link_libraries(libuvc_camera_nodelet ${Boost_LIBRARIES} ${catkin_LIBRARIES} ${libuvc_LIBRARIES}) install(TARGETS camera_node libuvc_camera_nodelet ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION} - ) \ No newline at end of file + )