Skip to content

Commit 7527abc

Browse files
author
David Gossow
committed
Merge pull request #11 from dgossow/hydro-devel
install rules for plugin & python tutorials
2 parents b9e673e + 0f7f89f commit 7527abc

File tree

3 files changed

+33
-1
lines changed

3 files changed

+33
-1
lines changed

rviz_plugin_tutorials/CMakeLists.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,27 @@ add_library(${PROJECT_NAME} ${SOURCE_FILES})
5555
## particular OS.
5656
target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${catkin_LIBRARIES})
5757
## END_TUTORIAL
58+
59+
60+
## Install rules
61+
62+
install(TARGETS
63+
${PROJECT_NAME}
64+
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
65+
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
66+
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
67+
)
68+
69+
install(FILES
70+
plugin_description.xml
71+
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
72+
73+
install(DIRECTORY media/
74+
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/media)
75+
76+
install(DIRECTORY icons/
77+
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/icons)
78+
79+
install(PROGRAMS scripts/send_test_msgs.py
80+
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
81+

rviz_python_tutorial/CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,12 @@ cmake_minimum_required(VERSION 2.8.3)
22
project(rviz_python_tutorial)
33
find_package(catkin REQUIRED COMPONENTS rviz)
44
catkin_package()
5+
6+
## Install rules
7+
8+
install(FILES
9+
config.myviz
10+
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
11+
12+
install(PROGRAMS myviz.py
13+
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})

rviz_python_tutorial/package.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,5 @@
1818

1919
<export>
2020
<rosdoc config="${prefix}/rosdoc.yaml"/>
21-
<rviz plugin="${prefix}/plugin_description.xml"/>
2221
</export>
2322
</package>

0 commit comments

Comments
 (0)