From 2eddc52a55bd8018965828d11b7f4ec2e7222a18 Mon Sep 17 00:00:00 2001
From: Reagan Lopez <reagan.lopez@intel.com>
Date: Mon, 21 Mar 2016 14:48:40 -0700
Subject: [PATCH] Added missing install targets

This fixes Pull Request #2
---
 camera/CMakeLists.txt                         | 28 +++++++++++++++----
 camera/package.xml                            |  7 ++---
 .../realsense_camera_nodelet_plugins.xml      |  0
 3 files changed, 26 insertions(+), 9 deletions(-)
 rename camera/{src => }/realsense_camera_nodelet_plugins.xml (100%)

diff --git a/camera/CMakeLists.txt b/camera/CMakeLists.txt
index 29dc548ee9..2625b7cb29 100644
--- a/camera/CMakeLists.txt
+++ b/camera/CMakeLists.txt
@@ -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}
+)
diff --git a/camera/package.xml b/camera/package.xml
index 688fa556a6..fc8ed84653 100644
--- a/camera/package.xml
+++ b/camera/package.xml
@@ -11,7 +11,7 @@
 
   <url type="website">http://www.ros.org/wiki/RealSense</url>
 
-  <author email="rajvi.jingar@intel.com">Rajvi Jingar</author> 
+  <author email="rajvi.jingar@intel.com">Rajvi Jingar</author>
   <author email="reagan.lopez@intel.com">Reagan Lopez</author>
   <author email="matthew.k.hansen@intel.com">Matt Hansen</author>
 
@@ -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>
@@ -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>
-
diff --git a/camera/src/realsense_camera_nodelet_plugins.xml b/camera/realsense_camera_nodelet_plugins.xml
similarity index 100%
rename from camera/src/realsense_camera_nodelet_plugins.xml
rename to camera/realsense_camera_nodelet_plugins.xml