[jsk_recognition_utils] add OpenCV to catkin_depends

jsk_recognition_utils/CMakeLists.txt

@@ -49,18 +49,12 @@ generate_dynamic_reconfigure_options(
   cfg/PolygonArrayToPolygon.cfg
 )
 
-catkin_package(
- INCLUDE_DIRS include
- LIBRARIES jsk_recognition_utils
- CATKIN_DEPENDS jsk_recognition_msgs pcl_ros visualization_msgs message_runtime
-)
-
 # Cythonize pyx files
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 include(UseCython)
 add_subdirectory(python/${PROJECT_NAME})
 
-find_package(OpenCV REQUIRED core imgproc)
+find_package(OpenCV REQUIRED)
 find_package(PCL REQUIRED)
 find_package(PkgConfig)
 pkg_check_modules(yaml_cpp yaml-cpp REQUIRED)
@@ -71,8 +65,16 @@ ENDIF()
 if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -z defs")
 endif()
+
+catkin_package(
+ INCLUDE_DIRS include ${OpenCV_INCLUDE_DIRS} ${PCL_INCLUDE_DIRS}
+ LIBRARIES jsk_recognition_utils
+ CATKIN_DEPENDS jsk_recognition_msgs pcl_ros visualization_msgs message_runtime
+ DEPENDS OpenCV PCL
+)
+
 include_directories(
-  include ${catkin_INCLUDE_DIRS}
+  include ${catkin_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS}
 )
 link_libraries(${catkin_LIBRARIES} ${OpenCV_LIBRARIES} ${PCL_LIBRARIES} yaml-cpp)
 

jsk_recognition_utils/package.xml

@@ -35,6 +35,7 @@
   <build_depend>visualization_msgs</build_depend>
   <build_depend>yaml-cpp</build_depend>
   <build_depend>message_generation</build_depend>
+  <build_depend>libopencv-dev</build_depend>
   <exec_depend>eigen_conversions</exec_depend>
   <exec_depend>geometry_msgs</exec_depend>
   <exec_depend>image_geometry</exec_depend>
@@ -58,6 +59,7 @@
   <exec_depend>visualization_msgs</exec_depend>
   <exec_depend>yaml-cpp</exec_depend>
   <exec_depend>message_runtime</exec_depend>
+  <exec_depend>libopencv-dev</exec_depend>
   <test_depend>jsk_tools</test_depend>
   <export>
   </export>