Require Boost 1.71.0, switch to BoostConfig.cmake

PointCloudLibrary · Aug 21, 2024 · 0c8bf25 · 0c8bf25
1 parent 4d0a15b
commit 0c8bf25
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
@@ -94,10 +94,7 @@ macro(find_boost)
     set(BOOST_INCLUDEDIR "@Boost_INCLUDE_DIR@")
   endif()
 
-  include(${CMAKE_CURRENT_LIST_DIR}/Modules/AdditionalBoostVersions.cmake)
-  set(Boost_ADDITIONAL_VERSIONS "@Boost_MAJOR_VERSION@.@Boost_MINOR_VERSION@.@Boost_SUBMINOR_VERSION@" "@Boost_MAJOR_VERSION@.@Boost_MINOR_VERSION@" ${Boost_ADDITIONAL_VERSIONS})
-
-  find_package(Boost 1.65.0 ${QUIET_} COMPONENTS @PCLCONFIG_AVAILABLE_BOOST_MODULES@)
+  find_package(Boost 1.71.0 ${QUIET_} COMPONENTS @PCLCONFIG_AVAILABLE_BOOST_MODULES@ CONFIG)
 
   set(BOOST_FOUND ${Boost_FOUND})
   set(BOOST_INCLUDE_DIRS "${Boost_INCLUDE_DIR}")

diff --git a/cmake/Modules/AdditionalBoostVersions.cmake b/cmake/Modules/AdditionalBoostVersions.cmake
diff --git a/cmake/pcl_find_boost.cmake b/cmake/pcl_find_boost.cmake
@@ -13,8 +13,6 @@ else()
   endif()
 endif()
 
-include(${CMAKE_CURRENT_LIST_DIR}/Modules/AdditionalBoostVersions.cmake)
-
 if(CMAKE_CXX_STANDARD MATCHES "14")
   # Optional boost modules
   set(BOOST_OPTIONAL_MODULES serialization mpi)
@@ -27,8 +25,8 @@ else()
   set(BOOST_REQUIRED_MODULES iostreams system)
 endif()
 
-find_package(Boost 1.65.0 QUIET COMPONENTS ${BOOST_OPTIONAL_MODULES})
-find_package(Boost 1.65.0 REQUIRED COMPONENTS ${BOOST_REQUIRED_MODULES})
+find_package(Boost 1.71.0 QUIET COMPONENTS ${BOOST_OPTIONAL_MODULES} CONFIG)
+find_package(Boost 1.71.0 REQUIRED COMPONENTS ${BOOST_REQUIRED_MODULES} CONFIG)
 
 if(Boost_FOUND)
   set(BOOST_FOUND TRUE)