Merge pull request ANYbotics#140 from ethz-asl/fix/opencv3_compilation

Adds in dependencies on OpenCV.
cyy1991 · Nov 16, 2017 · bd8e407 · bd8e407
2 parents c8af983 + fa712a6
commit bd8e407
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/grid_map_cv/CMakeLists.txt b/grid_map_cv/CMakeLists.txt
@@ -10,6 +10,11 @@ find_package(catkin REQUIRED COMPONENTS
   filters
 )
 
+find_package(OpenCV REQUIRED
+  COMPONENTS
+  opencv_photo
+)
+
 ###################################
 ## catkin specific configuration ##
 ###################################
@@ -29,6 +34,7 @@ catkin_package(
     cv_bridge
     filters
   DEPENDS
+    OpenCV
 )
 
 ###########
@@ -50,6 +56,7 @@ add_library(${PROJECT_NAME}
 
 target_link_libraries(${PROJECT_NAME}
   ${catkin_LIBRARIES}
+  ${OpenCV_LIBRARIES}
 )
 
 add_dependencies(${PROJECT_NAME}

diff --git a/grid_map_demos/CMakeLists.txt b/grid_map_demos/CMakeLists.txt
@@ -22,6 +22,10 @@ find_package(catkin REQUIRED COMPONENTS
   filters
 )
 
+find_package(OpenCV REQUIRED
+  COMPONENTS
+  opencv_highgui)
+
 find_package(octomap REQUIRED)
 
 ###################################
@@ -148,6 +152,7 @@ target_link_libraries(
 target_link_libraries(
   opencv_demo
   ${catkin_LIBRARIES}
+  ${OpenCV_LIBRARIES}
 )
 
 target_link_libraries(

diff --git a/grid_map_ros/src/GridMapRosConverter.cpp b/grid_map_ros/src/GridMapRosConverter.cpp
@@ -444,7 +444,8 @@ bool GridMapRosConverter::saveToBag(const grid_map::GridMap& gridMap, const std:
 {
   grid_map_msgs::GridMap message;
   toMessage(gridMap, message);
-  ros::Time time(gridMap.getTimestamp());
+  ros::Time time;
+  time.fromNSec(gridMap.getTimestamp());
 
   if (!time.isValid() || time.isZero()) {
     if (!ros::Time::isValid()) ros::Time::init();