Merge branch 'hydro-devel' of github.com:srv/srv_tools into hydro-devel

Author: plnegre

bag_tools/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(bag_tools)
 
-find_package(catkin REQUIRED COMPONENTS rospy rosbag sensor_msgs cv_bridge message_filters image_proc stereo_image_proc image_geometry camera_calibration_parsers)
+find_package(catkin REQUIRED COMPONENTS rospy rosbag sensor_msgs cv_bridge message_filters image_proc stereo_image_proc image_geometry camera_calibration_parsers console_bridge)
 find_package(Boost REQUIRED COMPONENTS signals thread)
 find_package(OpenCV REQUIRED)
 

bag_tools/package.xml

@@ -22,6 +22,7 @@
   <build_depend>stereo_image_proc</build_depend>
   <build_depend>image_geometry</build_depend>
   <build_depend>camera_calibration_parsers</build_depend>
+  <build_depend>console_bridge</build_depend>
   <run_depend>rospy</run_depend>
   <run_depend>rosbag</run_depend>
   <run_depend>sensor_msgs</run_depend>
@@ -31,6 +32,7 @@
   <run_depend>stereo_image_proc</run_depend>
   <run_depend>image_geometry</run_depend>
   <run_depend>camera_calibration_parsers</run_depend>
+  <run_depend>console_bridge</run_depend>
 
   <export>
   </export>