Merge pull request #5906 from mvieth/boost_1_84

Make PCL compatible with Boost 1.84
PointCloudLibrary · Dec 21, 2023 · b5e6d03 · b5e6d03
2 parents 4a389e1 + c750d07
commit b5e6d03
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
@@ -96,7 +96,7 @@ macro(find_boost)
 
   set(Boost_ADDITIONAL_VERSIONS
     "@Boost_MAJOR_VERSION@.@Boost_MINOR_VERSION@.@Boost_SUBMINOR_VERSION@" "@Boost_MAJOR_VERSION@.@Boost_MINOR_VERSION@"
-    "1.83.0" "1.83" "1.82.0" "1.82" "1.81.0" "1.81" "1.80.0" "1.80"
+    "1.84.0" "1.84" "1.83.0" "1.83" "1.82.0" "1.82" "1.81.0" "1.81" "1.80.0" "1.80"
     "1.79.0" "1.79" "1.78.0" "1.78" "1.77.0" "1.77" "1.76.0" "1.76" "1.75.0" "1.75" 
     "1.74.0" "1.74" "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70"
     "1.69.0" "1.69" "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65")

diff --git a/cmake/pcl_find_boost.cmake b/cmake/pcl_find_boost.cmake
@@ -14,7 +14,7 @@ else()
 endif()
 
 set(Boost_ADDITIONAL_VERSIONS
-  "1.83.0" "1.83" "1.82.0" "1.82" "1.81.0" "1.81" "1.80.0" "1.80"
+  "1.84.0" "1.84" "1.83.0" "1.83" "1.82.0" "1.82" "1.81.0" "1.81" "1.80.0" "1.80"
   "1.79.0" "1.79" "1.78.0" "1.78" "1.77.0" "1.77" "1.76.0" "1.76" "1.75.0" "1.75" 
   "1.74.0" "1.74" "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70"
   "1.69.0" "1.69" "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65")

diff --git a/io/src/ply/ply_parser.cpp b/io/src/ply/ply_parser.cpp
@@ -40,6 +40,7 @@
 
 #include <pcl/io/ply/ply_parser.h>
 
+#include <algorithm> // for find_if
 #include <fstream> // for ifstream
 #include <sstream> // for istringstream