Fix build issues on noetic

utexas-bwi · Nov 9, 2023 · a97eb08 · a97eb08
1 parent 108462b
commit a97eb08
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/bwi_manipulation/CMakeLists.txt b/bwi_manipulation/CMakeLists.txt
@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(bwi_manipulation)
 
-set(CMAKE_CXX_STANDARD 11)
+## Compile as C++14
+add_compile_options(-std=c++14)
 
 # We'll ignore any missing packages at this point and
 # rely on compile errors to highlight any real problems
@@ -27,7 +28,7 @@ if (agile_grasp_FOUND)
     add_definitions(-DAGILE_GRASP_AVAILABLE)
 endif()
 
-find_package(PCL 1.7 REQUIRED)
+find_package(PCL 1.10 REQUIRED)
 
 
 include_directories(${PCL_INCLUDE_DIRS})

diff --git a/bwi_perception/CMakeLists.txt b/bwi_perception/CMakeLists.txt
@@ -1,9 +1,11 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(bwi_perception)
 
-set(CMAKE_CXX_STANDARD 11)
+## Compile as C++14
+add_compile_options(-std=c++14)
 
 find_package( OpenCV REQUIRED)
+find_package(PCL 1.10 REQUIRED)
 
 find_package(catkin REQUIRED
 		actionlib_msgs
@@ -54,6 +56,7 @@ include_directories(
 	include
 	${catkin_INCLUDE_DIRS}
 	${OpenCV_INCLUDE_DIRS}
+	${PCL_INCLUDE_DIRS}
 )
 
 

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,9 +1,10 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(bwi_scavenger)
 
-set(CMAKE_CXX_STANDARD 11)
+## Compile as C++14
+add_compile_options(-std=c++14)
 
-find_package(PCL 1.7 REQUIRED)
+find_package(PCL 1.10 REQUIRED)
 find_package(OpenCV)
 
 find_package(PkgConfig REQUIRED)

diff --git a/knowledge_representation b/knowledge_representation