Merge pull request ros-industrial#110 from ros-industrial/indigo-devel

Syncing indigo-devel and indigo (release) branch.
OrebroUniversity · Mar 21, 2015 · 55e8686 · 55e8686
2 parents 8741ee9 + ac7588e
commit 55e8686
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/industrial_robot_simulator/CMakeLists.txt b/industrial_robot_simulator/CMakeLists.txt
@@ -2,22 +2,23 @@ cmake_minimum_required(VERSION 2.8.3)
 
 project(industrial_robot_simulator)
 
-find_package(catkin REQUIRED COMPONENTS roscpp std_msgs sensor_msgs 
-  control_msgs trajectory_msgs industrial_robot_client)
+find_package(catkin REQUIRED COMPONENTS std_msgs sensor_msgs
+  control_msgs trajectory_msgs)
 
 catkin_package(
-    CATKIN_DEPENDS roscpp std_msgs sensor_msgs control_msgs trajectory_msgs industrial_robot_client
+    CATKIN_DEPENDS std_msgs sensor_msgs control_msgs trajectory_msgs
 )
 
 ##########
 ## Test ##
 ##########
 
-# ROS launch testing
-## ROS launch testing should be re-enabled when the roslaunch script is officially
-## released (see https://github.com/ros/ros_comm/pull/333)
-##find_package(roslaunch)
-##roslaunch_add_file_check(launch)
+if (CATKIN_ENABLE_TESTING)
+  find_package(roslaunch REQUIRED)
+  roslaunch_add_file_check(launch
+    DEPENDENCIES
+      joint_trajectory_action)
+endif()
 
 #############
 ## Install ##

diff --git a/industrial_robot_simulator/package.xml b/industrial_robot_simulator/package.xml
@@ -9,20 +9,18 @@
   <author>Shaun Edwards</author>
 
   <buildtool_depend>catkin</buildtool_depend>
-  <build_depend>roscpp</build_depend>
   <build_depend>std_msgs</build_depend>
   <build_depend>sensor_msgs</build_depend>
   <build_depend>control_msgs</build_depend>
   <build_depend>trajectory_msgs</build_depend>
-  <build_depend>industrial_robot_client</build_depend>
   <build_depend>industrial_msgs</build_depend>
-  <build_depend>python-rospkg</build_depend>
-  <run_depend>roscpp</run_depend>
+  <build_depend version_gte="1.9.55">roslaunch</build_depend>
   <run_depend>std_msgs</run_depend>
   <run_depend>sensor_msgs</run_depend>
   <run_depend>control_msgs</run_depend>
   <run_depend>trajectory_msgs</run_depend>
   <run_depend>industrial_robot_client</run_depend>
   <run_depend>industrial_msgs</run_depend>
   <run_depend>python-rospkg</run_depend>
+  <run_depend>rospy</run_depend>
 </package>