From 4a7861a0a8eff24ba9ab14d8d0dba8f38b2d87b8 Mon Sep 17 00:00:00 2001
From: Florent Lamiraux <florent@laas.fr>
Date: Tue, 31 Mar 2015 11:27:41 +0200
Subject: [PATCH] Remove catkin dependency and install package.xml
---
CMakeLists.txt | 20 ++------------------
package.xml | 2 --
2 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e187fd..f254a5a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,10 +33,6 @@ FINDPYTHON()
SETUP_PROJECT()
-# Catkin stuff
-FIND_PACKAGE(catkin)
-CATKIN_PACKAGE()
-
# Activate hpp-util logging if requested
SET (HPP_DEBUG FALSE CACHE BOOL "trigger hpp-util debug output")
IF (HPP_DEBUG)
@@ -60,9 +56,8 @@ SET(CATKIN_PACKAGE_SHARE_DESTINATION
${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME})
install(FILES
- launch/tutorial.launch
- launch/tutorial_manipulation.launch
- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch
+ package.xml
+ DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)
install(FILES
urdf/pr2.urdf
@@ -75,11 +70,6 @@ install(FILES
srdf/box.srdf
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/srdf
)
-install(FILES
- rviz/config.rviz
- rviz/config_manipulation.rviz
- DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/rviz
- )
install (FILES
src/hpp/corbaserver/pr2/robot.py
src/hpp/corbaserver/pr2/__init__.py
@@ -90,12 +80,6 @@ install (FILES
DESTINATION ${PYTHON_SITELIB}/hpp/corbaserver/manipulation/pr2)
# Installation for documentation
-install(FILES
- launch/tutorial.launch
- launch/tutorial_manipulation.launch
- DESTINATION
- ${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}/doxygen-html/launch
- )
install(FILES
urdf/pr2.urdf
urdf/box.urdf
diff --git a/package.xml b/package.xml
index e68ca71..ae5ce94 100644
--- a/package.xml
+++ b/package.xml
@@ -7,7 +7,5 @@
<author>Florent Lamiraux</author>
<maintainer email="hpp@laas.fr">Florent Lamiraux</maintainer>
<license>LGPL v2</license>
- <buildtool_depend>catkin</buildtool_depend>
- <build_depend>hpp_ros</build_depend>
<build_depend>hpp-corbaserver</build_depend>
</package>
--
GitLab