Skip to content
Snippets Groups Projects
Commit 4a7861a0 authored by Florent Lamiraux's avatar Florent Lamiraux
Browse files

Remove catkin dependency and install package.xml

parent 1b89d7ff
No related branches found
No related tags found
No related merge requests found
...@@ -33,10 +33,6 @@ FINDPYTHON() ...@@ -33,10 +33,6 @@ FINDPYTHON()
SETUP_PROJECT() SETUP_PROJECT()
# Catkin stuff
FIND_PACKAGE(catkin)
CATKIN_PACKAGE()
# Activate hpp-util logging if requested # Activate hpp-util logging if requested
SET (HPP_DEBUG FALSE CACHE BOOL "trigger hpp-util debug output") SET (HPP_DEBUG FALSE CACHE BOOL "trigger hpp-util debug output")
IF (HPP_DEBUG) IF (HPP_DEBUG)
...@@ -60,9 +56,8 @@ SET(CATKIN_PACKAGE_SHARE_DESTINATION ...@@ -60,9 +56,8 @@ SET(CATKIN_PACKAGE_SHARE_DESTINATION
${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}) ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME})
install(FILES install(FILES
launch/tutorial.launch package.xml
launch/tutorial_manipulation.launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch
) )
install(FILES install(FILES
urdf/pr2.urdf urdf/pr2.urdf
...@@ -75,11 +70,6 @@ install(FILES ...@@ -75,11 +70,6 @@ install(FILES
srdf/box.srdf srdf/box.srdf
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/srdf DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/srdf
) )
install(FILES
rviz/config.rviz
rviz/config_manipulation.rviz
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/rviz
)
install (FILES install (FILES
src/hpp/corbaserver/pr2/robot.py src/hpp/corbaserver/pr2/robot.py
src/hpp/corbaserver/pr2/__init__.py src/hpp/corbaserver/pr2/__init__.py
...@@ -90,12 +80,6 @@ install (FILES ...@@ -90,12 +80,6 @@ install (FILES
DESTINATION ${PYTHON_SITELIB}/hpp/corbaserver/manipulation/pr2) DESTINATION ${PYTHON_SITELIB}/hpp/corbaserver/manipulation/pr2)
# Installation for documentation # Installation for documentation
install(FILES
launch/tutorial.launch
launch/tutorial_manipulation.launch
DESTINATION
${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}/doxygen-html/launch
)
install(FILES install(FILES
urdf/pr2.urdf urdf/pr2.urdf
urdf/box.urdf urdf/box.urdf
......
...@@ -7,7 +7,5 @@ ...@@ -7,7 +7,5 @@
<author>Florent Lamiraux</author> <author>Florent Lamiraux</author>
<maintainer email="hpp@laas.fr">Florent Lamiraux</maintainer> <maintainer email="hpp@laas.fr">Florent Lamiraux</maintainer>
<license>LGPL v2</license> <license>LGPL v2</license>
<buildtool_depend>catkin</buildtool_depend>
<build_depend>hpp_ros</build_depend>
<build_depend>hpp-corbaserver</build_depend> <build_depend>hpp-corbaserver</build_depend>
</package> </package>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment