Bump C++ versions and explicitly link OpenNI for bwi_perception

utexas-bwi · Jul 4, 2024 · f9722cc · f9722cc
1 parent 85004cc
commit f9722cc
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/bwi_logical_translator/CMakeLists.txt b/bwi_logical_translator/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(bwi_logical_translator)
 
+SET(CMAKE_CXX_STANDARD 14)
+
 add_compile_options(-std=c++11)
 
 find_package(catkin REQUIRED

diff --git a/bwi_manipulation/CMakeLists.txt b/bwi_manipulation/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(bwi_manipulation)
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 14)
 
 # We'll ignore any missing packages at this point and
 # rely on compile errors to highlight any real problems

diff --git a/bwi_perception/CMakeLists.txt b/bwi_perception/CMakeLists.txt
@@ -1,7 +1,10 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(bwi_perception)
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 14)
+
+set(OPENNI_INCLUDE_DIR "/usr/include/ni")
+set(OPENNI_LIBS "/usr/lib/libOpenNI.so")
 
 find_package( OpenCV REQUIRED)
 
@@ -54,6 +57,7 @@ include_directories(
 	include
 	${catkin_INCLUDE_DIRS}
 	${OpenCV_INCLUDE_DIRS}
+	${OPENNI_INCLUDE_DIR}
 )
 
 
@@ -69,30 +73,30 @@ add_dependencies(libbwi_perception ${bwi_perception_EXPORTED_TARGETS})
 
 add_executable(horizontal_surface_detector src/horizontal_surface_detector.cpp)
 add_dependencies(horizontal_surface_detector ${bwi_perception_EXPORTED_TARGETS})
-target_link_libraries(horizontal_surface_detector libbwi_perception ${catkin_LIBRARIES} ${PCL_LIBRARIES})
+target_link_libraries(horizontal_surface_detector libbwi_perception ${catkin_LIBRARIES} ${PCL_LIBRARIES} ${OPENNI_LIBS})
 
 add_executable(image_logging_server src/image_logging_server.cpp)
 add_dependencies(image_logging_server ${bwi_perception_EXPORTED_TARGETS})
 target_link_libraries(image_logging_server ${catkin_LIBRARIES} ${PCL_LIBRARIES})
 
 add_executable(obstacle_cloud_manager src/obstacle_cloud_manager.cpp)
 add_dependencies(obstacle_cloud_manager ${bwi_perception_EXPORTED_TARGETS})
-target_link_libraries(obstacle_cloud_manager ${catkin_LIBRARIES} ${PCL_LIBRARIES})
+target_link_libraries(obstacle_cloud_manager ${catkin_LIBRARIES} ${PCL_LIBRARIES} ${OPENNI_LIBS})
 
 add_executable(pointcloud_feature_server src/pointcloud_feature_server.cpp)
 add_dependencies(pointcloud_feature_server ${bwi_perception_EXPORTED_TARGETS})
-target_link_libraries(pointcloud_feature_server ${catkin_LIBRARIES} ${PCL_LIBRARIES})
+target_link_libraries(pointcloud_feature_server ${catkin_LIBRARIES} ${PCL_LIBRARIES} ${OPENNI_LIBS})
 
 add_executable(tabletop_scene_perception_node src/tabletop_scene_perception_node.cpp)
 add_dependencies(tabletop_scene_perception_node ${bwi_perception_EXPORTED_TARGETS})
-target_link_libraries(tabletop_scene_perception_node libbwi_perception ${catkin_LIBRARIES} ${PCL_LIBRARIES})
+target_link_libraries(tabletop_scene_perception_node libbwi_perception ${catkin_LIBRARIES} ${PCL_LIBRARIES} ${OPENNI_LIBS})
 
 add_executable(table_change_detection_node src/table_change_detection_node.cpp)
 add_dependencies(table_change_detection_node ${bwi_perception_EXPORTED_TARGETS})
-target_link_libraries(table_change_detection_node libbwi_perception ${catkin_LIBRARIES} ${PCL_LIBRARIES})
+target_link_libraries(table_change_detection_node libbwi_perception ${catkin_LIBRARIES} ${PCL_LIBRARIES} ${OPENNI_LIBS})
 
 add_executable(button_detection_srv_node src/button_detection_srv_node.cpp)
-target_link_libraries(button_detection_srv_node ${catkin_LIBRARIES} ${PCL_LIBRARIES})
+target_link_libraries(button_detection_srv_node ${catkin_LIBRARIES} ${PCL_LIBRARIES} ${OPENNI_LIBS})
 add_dependencies(button_detection_srv_node ${bwi_perception_EXPORTED_TARGETS})
 
 

diff --git a/bwi_perception/src/image_logging_server.cpp b/bwi_perception/src/image_logging_server.cpp
@@ -13,7 +13,7 @@
 #elif CV_MAJOR_VERSION == 3
   #include <opencv2/imgcodecs.hpp>      // for cv::imwrite()
 #endif
-#include <opencv/highgui.h>
+#include <opencv2/highgui.hpp>
 #include <cv_bridge/cv_bridge.h>
 #include <pcl_ros/point_cloud.h>
 #include <pcl/point_types.h>

diff --git a/bwi_scavenger/CMakeLists.txt b/bwi_scavenger/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(bwi_scavenger)
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 14)
 
 find_package(PCL 1.7 REQUIRED)
 find_package(OpenCV)