Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
bigprint
universal_robot
Commits
036aa389
Commit
036aa389
authored
Mar 24, 2014
by
Florian Weisshardt
Browse files
Merge branch 'hydro-devel' into hydro
parents
d667d0be
e1190b00
Changes
2
Hide whitespace changes
Inline
Side-by-side
ur_description/CMakeLists.txt
View file @
036aa389
...
...
@@ -83,9 +83,9 @@ catkin_package(
## Install ##
#############
install
(
DIRECTORY launch DESTINATION
${
CATKIN_PACKAGE_SHARE_DESTINATION
}
/launch
)
install
(
DIRECTORY urdf DESTINATION
${
CATKIN_PACKAGE_SHARE_DESTINATION
}
/urdf
)
install
(
DIRECTORY meshes DESTINATION
${
CATKIN_PACKAGE_SHARE_DESTINATION
}
/meshes
)
install
(
DIRECTORY launch DESTINATION
${
CATKIN_PACKAGE_SHARE_DESTINATION
}
)
install
(
DIRECTORY urdf DESTINATION
${
CATKIN_PACKAGE_SHARE_DESTINATION
}
)
install
(
DIRECTORY meshes DESTINATION
${
CATKIN_PACKAGE_SHARE_DESTINATION
}
)
# all install targets should use catkin DESTINATION variables
# See http://ros.org/doc/api/catkin/html/adv_user_guide/variables.html
...
...
ur_driver/CMakeLists.txt
View file @
036aa389
...
...
@@ -84,10 +84,13 @@ catkin_package()
## Mark executable scripts (Python etc.) for installation
## in contrast to setup.py, you can choose the destination
# install(PROGRAMS
# scripts/my_python_script
# DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
# )
install
(
PROGRAMS test_move.py
DESTINATION
${
CATKIN_PACKAGE_BIN_DESTINATION
}
)
install
(
PROGRAMS src/ur_driver/driver.py
DESTINATION
${
CATKIN_PACKAGE_BIN_DESTINATION
}
)
## Mark executables and/or libraries for installation
# install(TARGETS ur_driver ur_driver_node
...
...
@@ -104,11 +107,9 @@ catkin_package()
# )
## Mark other files for installation (e.g. launch and bag files, etc.)
# install(FILES
# # myfile1
# # myfile2
# DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
# )
install
(
FILES test.launch prog prog_reset
DESTINATION
${
CATKIN_PACKAGE_SHARE_DESTINATION
}
)
#############
## Testing ##
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment