Merge pull request #81 from OctoMap/noetic

Address warnings on Noetic
OctoMap · Jan 24, 2021 · 84633da · 84633da
2 parents bd66bc1 + d8858a6
commit 84633da
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/octomap_mapping/CMakeLists.txt b/octomap_mapping/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.0.2)
 project(octomap_mapping)
 find_package(catkin REQUIRED)
 catkin_metapackage()
diff --git a/octomap_server/CMakeLists.txt b/octomap_server/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.0.2)
 project(octomap_server)
 
 set(PACKAGE_DEPENDENCIES
@@ -16,7 +16,6 @@ set(PACKAGE_DEPENDENCIES
   nodelet
 )
 
-
 find_package(catkin REQUIRED COMPONENTS ${PACKAGE_DEPENDENCIES})
 
 find_package(octomap REQUIRED)
@@ -93,13 +92,10 @@ install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_color
 
 install(DIRECTORY include/${PROJECT_NAME}/
   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
-  FILES_MATCHING PATTERN "*.h"
-  PATTERN ".svn" EXCLUDE
 )
 
 install(DIRECTORY launch/
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch
-  PATTERN ".svn" EXCLUDE
 )
 
 install(FILES 

diff --git a/octomap_server/include/octomap_server/OctomapServer.h b/octomap_server/include/octomap_server/OctomapServer.h
@@ -46,7 +46,12 @@
 #include <pcl/conversions.h>
 #include <pcl_ros/transforms.h>
 #include <pcl/sample_consensus/method_types.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"  // pcl::SAC_SAMPLE_SIZE is protected since PCL 1.8.0
 #include <pcl/sample_consensus/model_types.h>
+#pragma GCC diagnostic pop
+
 #include <pcl/segmentation/sac_segmentation.h>
 #include <pcl/io/pcd_io.h>
 #include <pcl/filters/extract_indices.h>