Skip to content

Commit

Permalink
Merge pull request IntelRealSense#29 from otcshare/RAR-262-missing-in…
Browse files Browse the repository at this point in the history
…stall-targets

Added missing install targets
  • Loading branch information
reaganlo committed Mar 22, 2016
2 parents f8f234d + 2eddc52 commit 27b17bb
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 9 deletions.
28 changes: 23 additions & 5 deletions camera/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,29 +43,47 @@ generate_dynamic_reconfigure_options(
cfg/camera_params.cfg
)



include_directories(
${catkin_INCLUDE_DIRS}
)

add_library(realsense_camera_nodelet src/realsense_camera_nodelet.cpp)
target_link_libraries(realsense_camera_nodelet
target_link_libraries(realsense_camera_nodelet
${catkin_LIBRARIES}
/usr/local/lib/librealsense.so
)
add_dependencies(realsense_camera_nodelet realsense_camera_generate_messages_cpp ${PROJECT_NAME}_gencfg)

add_executable(realsense_camera_test test/realsense_camera_test_node.cpp)
target_link_libraries(realsense_camera_test
target_link_libraries(realsense_camera_test
${catkin_LIBRARIES}
${GTEST_LIBRARIES}
)
add_dependencies(realsense_camera_test realsense_camera_generate_messages_cpp ${PROJECT_NAME}_gencfg)

add_executable(realsense_camera_test_rgbd test/realsense_camera_test_rgbd_node.cpp)
target_link_libraries(realsense_camera_test_rgbd
target_link_libraries(realsense_camera_test_rgbd
${catkin_LIBRARIES}
${GTEST_LIBRARIES}
)
add_dependencies(realsense_camera_test_rgbd realsense_camera_generate_messages_cpp)

# Install nodelet library
install(TARGETS realsense_camera_nodelet LIBRARY
DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
)

# Install launch files
install(DIRECTORY launch/
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch
)

# Install rviz files
install(DIRECTORY rviz/
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/rviz
)

# Install xml files
install(FILES package.xml realsense_camera_nodelet_plugins.xml
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)
7 changes: 3 additions & 4 deletions camera/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<url type="website">http://www.ros.org/wiki/RealSense</url>

<author email="[email protected]">Rajvi Jingar</author>
<author email="[email protected]">Rajvi Jingar</author>
<author email="[email protected]">Reagan Lopez</author>
<author email="[email protected]">Matt Hansen</author>

Expand All @@ -28,7 +28,7 @@
<build_depend>rostest</build_depend>
<build_depend>pcl_ros</build_depend>
<build_depend>dynamic_reconfigure</build_depend>

<run_depend>roscpp</run_depend>
<run_depend>nodelet</run_depend>
<run_depend>cv_bridge</run_depend>
Expand All @@ -44,7 +44,6 @@
<run_depend>rgbd_launch</run_depend>

<export>
<nodelet plugin="${prefix}/src/realsense_camera_nodelet_plugins.xml" />
<nodelet plugin="${prefix}/realsense_camera_nodelet_plugins.xml" />
</export>
</package>

File renamed without changes.

0 comments on commit 27b17bb

Please sign in to comment.