Fixed ROS build files to be compatible with ROSDEP.

peci1 · Jun 8, 2015 · 2bb66e0 · 2bb66e0
1 parent 3f32aa4
commit 2bb66e0
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/ros_bubble_rob/package.xml b/ros_bubble_rob/package.xml
@@ -10,7 +10,7 @@
   <build_depend>roscpp</build_depend>
   <build_depend>std_msgs</build_depend>
   <build_depend>sensor_msgs</build_depend>
-  <build_depend>opencv2</build_depend>
+  <build_depend>libopencv-dev</build_depend>
   <build_depend>vrep_common</build_depend>
   <build_depend>image_transport</build_depend>
   <run_depend>roscpp</run_depend>

diff --git a/vrep_common/CMakeLists.txt b/vrep_common/CMakeLists.txt
@@ -37,5 +37,5 @@ generate_messages(DEPENDENCIES std_msgs sensor_msgs)
 
 catkin_package(
   LIBRARIES
-  CATKIN_DEPENDS
+  CATKIN_DEPENDS message_runtime
 )
diff --git a/vrep_common/package.xml b/vrep_common/package.xml
@@ -10,8 +10,10 @@
   <build_depend>roscpp</build_depend>
   <build_depend>std_msgs</build_depend>
   <build_depend>sensor_msgs</build_depend>
-  <build_depend>opencv2</build_depend>
+  <build_depend>libopencv-dev</build_depend>
+  <build_depend>message_generation</build_depend>
   <run_depend>roscpp</run_depend>
+  <run_depend>message_runtime</run_depend>
 </package>
 
 
diff --git a/vrep_plugin/package.xml b/vrep_plugin/package.xml
@@ -10,14 +10,14 @@
   <build_depend>roscpp</build_depend>
   <build_depend>std_msgs</build_depend>
   <build_depend>sensor_msgs</build_depend>
-  <build_depend>opencv2</build_depend>
+  <build_depend>libopencv-dev</build_depend>
   <build_depend>vrep_common</build_depend>
   <build_depend>image_transport</build_depend>
   <build_depend>tf</build_depend>
   <run_depend>roscpp</run_depend>
   <run_depend>std_msgs</run_depend>
   <run_depend>sensor_msgs</run_depend>
-  <run_depend>opencv2</run_depend>
+  <run_depend>libopencv-dev</run_depend>
   <run_depend>image_transport</run_depend>
   <run_depend>tf</run_depend>
   <run_depend>brics_actuator</run_depend>

diff --git a/vrep_skeleton_msg_and_srv/CMakeLists.txt b/vrep_skeleton_msg_and_srv/CMakeLists.txt
@@ -14,5 +14,5 @@ generate_messages(DEPENDENCIES std_msgs)
 
 catkin_package(
   LIBRARIES
-  CATKIN_DEPENDS
+  CATKIN_DEPENDS message_runtime
 )
diff --git a/vrep_skeleton_msg_and_srv/package.xml b/vrep_skeleton_msg_and_srv/package.xml
@@ -9,7 +9,9 @@
   <buildtool_depend>catkin</buildtool_depend>
   <build_depend>roscpp</build_depend>
   <build_depend>std_msgs</build_depend>
+  <build_depend>message_generation</build_depend>
   <run_depend>roscpp</run_depend>
+  <run_depend>message_runtime</run_depend>
 </package>