[Fix] dependency

motoman_gazebo/CMakeLists.txt

@@ -1,24 +1,35 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(motoman_gazebo)
 find_package(catkin REQUIRED COMPONENTS
+    #actionlib_msg
     motoman_description
     motoman_point_cloud
+    roslaunch
     )
 
-catkin_package()
-
-find_package(roslaunch)
+catkin_package(
+    CATKIN_DEPENDS
+    #actionlib_msgs
+    motoman_description
+    motoman_point_cloud
+    )
 
+# Install
 foreach(dir launch models worlds)
   install(DIRECTORY ${dir}/
     DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir})
 endforeach(dir)
 
-roslaunch_add_file_check(test/sia5_empty_world_launch_test.xml)
-roslaunch_add_file_check(test/sia5_with_jamming_launch_test.xml)
-roslaunch_add_file_check(test/sia5_with_jamming_and_kinectv2_launch_test.xml)
-roslaunch_add_file_check(test/sia5_with_kinectv2_launch_test.xml)
-roslaunch_add_file_check(test/sia5_with_multi_kinectv2_launch_test.xml)
-roslaunch_add_file_check(test/sia5_gazebo_nishida_lab_launch_test.xml)
-roslaunch_add_file_check(test/sia5_with_dhand_launch_test.xml)
-roslaunch_add_file_check(test/sia5_with_dhand_and_multi_kinect_launch_test.xml)
+# Test
+if (CATKIN_ENABLE_TESTING)
+  find_package(roslaunch REQUIRED)
+  roslaunch_add_file_check(launch)
+endif()
+#roslaunch_add_file_check(test/sia5_empty_world_launch_test.xml)
+#roslaunch_add_file_check(test/sia5_with_jamming_launch_test.xml)
+#roslaunch_add_file_check(test/sia5_with_jamming_and_kinectv2_launch_test.xml)
+#roslaunch_add_file_check(test/sia5_with_kinectv2_launch_test.xml)
+#roslaunch_add_file_check(test/sia5_with_multi_kinectv2_launch_test.xml)
+#roslaunch_add_file_check(test/sia5_gazebo_nishida_lab_launch_test.xml)
+#roslaunch_add_file_check(test/sia5_with_dhand_launch_test.xml)
+#roslaunch_add_file_check(test/sia5_with_dhand_and_multi_kinect_launch_test.xml)

motoman_gazebo/package.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package>
+<package format="2">
   <name>motoman_gazebo</name>
   <version>0.1.0</version>
   <description>The motoman_gazebo package</description>
@@ -9,10 +9,11 @@
   <url type="repository">http://github.com/Nishida-Lab/motoman_project</url>
 
   <buildtool_depend>catkin</buildtool_depend>
-  <run_depend>ros_control</run_depend>
-  <run_depend>gazebo_ros_control</run_depend>
-  <run_depend>gazebo_ros</run_depend>
-  <run_depend>motoman_control</run_depend>
-  <run_depend>motoman_description</run_depend>
-  <run_depend>motoman_point_cloud</run_depend>
+  <!--depend>actionlib_msgs</depend-->
+  <depend>motoman_description</depend>
+  <depend>motoman_point_cloud</depend>
+  <exec_depend>ros_control</exec_depend>
+  <exec_depend>gazebo_ros_control</exec_depend>
+  <exec_depend>gazebo_ros</exec_depend>
+  <exec_depend>motoman_control</exec_depend>
 </package>