From 56cf07f62fcdd3927ebff216da281d3b975adefc Mon Sep 17 00:00:00 2001
From: IPR-SR2 <ipr-sr2@ira.uka.de>
Date: Fri, 13 Sep 2013 21:17:57 +0200
Subject: [PATCH] Added definitions for adding tergets in install folder. Issue
#10.
---
ur_bringup/CMakeLists.txt | 2 ++
ur_description/CMakeLists.txt | 4 ++++
ur_driver/CMakeLists.txt | 2 ++
ur_gazebo/CMakeLists.txt | 4 ++++
ur_kinematics/CMakeLists.txt | 11 +++++++++++
5 files changed, 23 insertions(+)
diff --git a/ur_bringup/CMakeLists.txt b/ur_bringup/CMakeLists.txt
index 45fd1aa..23fed14 100644
--- a/ur_bringup/CMakeLists.txt
+++ b/ur_bringup/CMakeLists.txt
@@ -83,6 +83,8 @@ catkin_package(
## Install ##
#############
+install(DIRECTORY launch 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
diff --git a/ur_description/CMakeLists.txt b/ur_description/CMakeLists.txt
index 28d06f3..ba73708 100644
--- a/ur_description/CMakeLists.txt
+++ b/ur_description/CMakeLists.txt
@@ -83,6 +83,10 @@ catkin_package(
## Install ##
#############
+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
diff --git a/ur_driver/CMakeLists.txt b/ur_driver/CMakeLists.txt
index 4667a7a..f7ad8ce 100644
--- a/ur_driver/CMakeLists.txt
+++ b/ur_driver/CMakeLists.txt
@@ -54,6 +54,8 @@ catkin_package(
# DEPENDS system_lib
)
+catkin_python_setup()
+
###########
## Build ##
###########
diff --git a/ur_gazebo/CMakeLists.txt b/ur_gazebo/CMakeLists.txt
index 3f1e0b7..0fb3c5f 100644
--- a/ur_gazebo/CMakeLists.txt
+++ b/ur_gazebo/CMakeLists.txt
@@ -83,6 +83,10 @@ catkin_package(
## Install ##
#############
+install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
+install(DIRECTORY controller 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
diff --git a/ur_kinematics/CMakeLists.txt b/ur_kinematics/CMakeLists.txt
index 39d177c..d7d5f2a 100644
--- a/ur_kinematics/CMakeLists.txt
+++ b/ur_kinematics/CMakeLists.txt
@@ -88,6 +88,17 @@ set_target_properties(ur5_kin PROPERTIES COMPILE_DEFINITIONS "UR5_PARAMS")
## Install ##
#############
+install(TARGETS ur5_kin ur10_kin
+ ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+ LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+ RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
+
+# install header files
+install(DIRECTORY include/${PROJECT_NAME}/
+ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
+)
+
# all install targets should use catkin DESTINATION variables
# See http://ros.org/doc/api/catkin/html/adv_user_guide/variables.html
--
GitLab