blob: 530f1ce626aaa481d244a0135eda28344a7e499c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
From 0c8bf25e2a6d7e721983422f8513cdc177f8d1ab Mon Sep 17 00:00:00 2001
From: Markus Vieth <mvieth@techfak.uni-bielefeld.de>
Date: Thu, 15 Aug 2024 17:26:19 +0200
Subject: [PATCH] Require Boost 1.71.0, switch to BoostConfig.cmake
---
PCLConfig.cmake.in | 5 +----
cmake/Modules/AdditionalBoostVersions.cmake | 7 -------
cmake/pcl_find_boost.cmake | 6 ++----
3 files changed, 3 insertions(+), 15 deletions(-)
delete mode 100644 cmake/Modules/AdditionalBoostVersions.cmake
diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
index a650af86fd7..b179a5d8b6e 100644
--- 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
deleted file mode 100644
index 0a06d08d0eb..00000000000
--- a/cmake/Modules/AdditionalBoostVersions.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-
-set(Boost_ADDITIONAL_VERSIONS
- "1.85.0" "1.85"
- "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
index f9e0b28d12c..5d5c7859e0a 100644
--- 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)
|
