[Fix] dependencies

Nishida-Lab · Aug 5, 2018 · dadfe2b · dadfe2b
1 parent 4f95cec
commit dadfe2b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,7 @@ env:
     - CATKIN_PARALLEL_TEST_JOBS=-p1
     - ROS_PARALLEL_TEST_JOBS=-j1
     - NOT_TEST_INSTALL=true
-    - ROSDEP_SKIP_KEYS="artoolkit ar_tools ar_pose motoman_description motoman_gazebo motoman_control motoman_sia5_moveit_config"
+    - ROSDEP_SKIP_KEYS="artoolkit ar_tools ar_pose motoman_description motoman_gazebo motoman_control motoman_sia5_moveit_config motoman_moveit"
     - UPSTREAM_WORKSPACE=file
     - ROSINSTALL_FILENAME=.ci.rosinstall
     - BEFORE_SCRIPT='./.preprocess.sh'

diff --git a/motoman_control/package.xml b/motoman_control/package.xml
@@ -24,6 +24,7 @@
   <run_depend>robot_state_publisher</run_depend>
   <run_depend>ros_controllers</run_depend>
   <run_depend>motoman_driver</run_depend>
+  <run_depend>motoman_description</run_depend>
   <run_depend>industrial_robot_client</run_depend>
   <run_depend>dhand_control</run_depend>
 

diff --git a/motoman_description/CMakeLists.txt b/motoman_description/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.3)
 project(motoman_description)
 find_package(catkin REQUIRED)
 
-foreach(dir launch meshes urdf robots)
+foreach(dir launch meshes urdf robots robots/sia5)
   install(DIRECTORY ${dir}/
     DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir})
 endforeach(dir)

diff --git a/motoman_recognition/motoman_point_cloud/package.xml b/motoman_recognition/motoman_point_cloud/package.xml
@@ -6,37 +6,36 @@
 
   <maintainer email="groadpg@gmail.com">RyodoTanaka</maintainer>
   <maintainer email="ry0@todo.todo">ry0</maintainer>
+  <maintainer email="p595201m@mail.kyutech.jp">MoriKen</maintainer>
 
   <license>BSD</license>
   <url type="repository">http://github.com/Nishida-Lab/motoman_project</url>
 
   <buildtool_depend>catkin</buildtool_depend>
-  <build_depend>rospy</build_depend>
-  <run_depend>rospy</run_depend>
-  <run_depend>rviz</run_depend>
 
-  <build_depend>roscpp</build_depend>
   <build_depend>boost</build_depend>
   <build_depend>eigen</build_depend>
   <build_depend>cmake_modules</build_depend>
-
-  <run_depend>roscpp</run_depend>
-  <run_depend>boost</run_depend>
-  <run_depend>eigen</run_depend>
-  <run_depend>cmake_modules</run_depend>
-
   <build_depend>libpcl-all-dev</build_depend>
+  <build_depend>roscpp</build_depend>
+  <build_depend>rospy</build_depend>
   <build_depend>pcl_ros</build_depend>
   <build_depend>pcl_msgs</build_depend>
   <build_depend>sensor_msgs</build_depend>
   <build_depend>std_msgs</build_depend>
   <build_depend>tf</build_depend>
-
   <build_depend>tf_conversions</build_depend>
+
+  <run_depend>boost</run_depend>
+  <run_depend>cmake_modules</run_depend>
+  <run_depend>eigen</run_depend>
   <run_depend>libpcl-all</run_depend>s
+  <run_depend>motoman_moveit</run_depend>
   <run_depend>pcl_ros</run_depend>
-  <run_depend>roscpp</run_depend>
   <run_depend>pcl_msgs</run_depend>
+  <run_depend>roscpp</run_depend>
+  <run_depend>rospy</run_depend>
+  <run_depend>rviz</run_depend>
   <run_depend>sensor_msgs</run_depend>
   <run_depend>std_msgs</run_depend>
   <run_depend>tf</run_depend>