Commit 9b5d9435 authored by Ken Tossell's avatar Ken Tossell
Browse files

libuvc_camera now uses the libuvc cmake config script

parent b4a4d2df
...@@ -6,7 +6,8 @@ find_package(catkin REQUIRED COMPONENTS roscpp camera_info_manager driver_base d ...@@ -6,7 +6,8 @@ find_package(catkin REQUIRED COMPONENTS roscpp camera_info_manager driver_base d
generate_dynamic_reconfigure_options(cfg/UVCCamera.cfg) generate_dynamic_reconfigure_options(cfg/UVCCamera.cfg)
#find_package(libuvc REQUIRED) find_package(libuvc REQUIRED)
catkin_package( catkin_package(
CATKIN_DEPENDS CATKIN_DEPENDS
roscpp roscpp
...@@ -19,21 +20,21 @@ catkin_package( ...@@ -19,21 +20,21 @@ catkin_package(
LIBRARIES libuvc_camera_nodelet 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}) link_directories(${catkin_LINK_DIRS})
find_package(Boost REQUIRED COMPONENTS thread) find_package(Boost REQUIRED COMPONENTS thread)
include_directories(${Boost_INCLUDE_DIRS}) include_directories(${Boost_INCLUDE_DIRS})
add_executable(camera_node src/main.cpp src/camera_driver.cpp) 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_library(libuvc_camera_nodelet src/nodelet.cpp src/camera_driver.cpp)
add_dependencies(libuvc_camera_nodelet ${libuvc_camera_EXPORTED_TARGETS}) 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 install(TARGETS camera_node libuvc_camera_nodelet
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION} RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
) )
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment