summaryrefslogtreecommitdiff
blob: a77968db860a36a55f194fedcbb9b002ba74ed22 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
Install ressources in ros_packages subdir. We force catkin to install packages
there, so move them too.

Index: rviz-1.12.3/CMakeLists.txt
===================================================================
--- rviz-1.12.3.orig/CMakeLists.txt
+++ rviz-1.12.3/CMakeLists.txt
@@ -220,17 +220,17 @@ include_directories(src ${catkin_INCLUDE
 add_subdirectory(src)
 
 install(DIRECTORY ogre_media
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
+	DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME}
 )
 install(DIRECTORY icons
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
+	DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME}
 )
 install(DIRECTORY images
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
+	DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME}
 )
 install(FILES default.rviz
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
+	DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME}
 )
 install(FILES plugin_description.xml
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
+	DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME}
 )