Resolving build errors for OpenCV.

sivasriram2112 · Apr 18, 2016 · 16ecee6 · 16ecee6
1 parent 1ce710f
commit 16ecee6
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/grid_map_cv/CMakeLists.txt b/grid_map_cv/CMakeLists.txt
@@ -79,9 +79,13 @@ install(
 ## Testing ##
 #############
 
+if(CATKIN_ENABLE_TESTING)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
 ## Add gtest based cpp test target and link libraries
 catkin_add_gtest(${PROJECT_NAME}-test test/test_grid_map_cv.cpp test/GridMapCvTest.cpp)
+endif()
+
 if(TARGET ${PROJECT_NAME}-test)
   target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
 endif()
+
diff --git a/grid_map_cv/include/grid_map_cv/GridMapCvConverter.hpp b/grid_map_cv/include/grid_map_cv/GridMapCvConverter.hpp
@@ -11,7 +11,10 @@
 #include <grid_map_core/grid_map_core.hpp>
 
 // OpenCV
-#include <opencv/cv.h>
+#include <opencv2/opencv.hpp>
+
+// STD
+#include <iostream>
 
 namespace grid_map {
 

diff --git a/grid_map_cv/include/grid_map_cv/GridMapCvProcessing.hpp b/grid_map_cv/include/grid_map_cv/GridMapCvProcessing.hpp
@@ -11,7 +11,7 @@
 #include <grid_map_core/grid_map_core.hpp>
 
 // OpenCV
-#include <opencv/cv.h>
+#include <opencv2/opencv.hpp>
 
 namespace grid_map {
 

diff --git a/grid_map_cv/package.xml b/grid_map_cv/package.xml
@@ -10,5 +10,5 @@
   <author email="[email protected]">Péter Fankhauser</author>
   <buildtool_depend>catkin</buildtool_depend>
   <depend>grid_map_core</depend>
-  <depend>opencv3</depend>
+  <depend>opencv2</depend>
 </package>
diff --git a/grid_map_demos/src/opencv_demo_node.cpp b/grid_map_demos/src/opencv_demo_node.cpp
@@ -1,9 +1,7 @@
 #include <ros/ros.h>
 #include <grid_map_ros/grid_map_ros.hpp>
 #include <grid_map_cv/grid_map_cv.hpp>
-#include <opencv/cv.h>
-#include <opencv2/imgproc/imgproc.hpp>
-#include <opencv/highgui.h>
+#include <opencv2/opencv.hpp>
 
 using namespace grid_map;
 using namespace ros;