summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-06-03 15:22:19 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-07 08:52:55 +0100
commitdd475f1d04b3a091e704a6193bbcf902197f12cc (patch)
tree54ea493e8cca3ae8a778e13a3e40c4db0b468d54 /meta
parent5dbcf72c6466c96e51d803e499e4e2184250aaa8 (diff)
downloadpoky-dd475f1d04b3a091e704a6193bbcf902197f12cc.tar.gz
cmake: fix build issue with boost 1.67.0
this fixes a build issue with boost 1.67.0 [Yocto 12762] (From OE-Core rev: 04f367e27e66105466611bee4d63abc78e0a4725) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc3
-rw-r--r--meta/recipes-devtools/cmake/cmake/0004-FindBoost-Generate-imported-targets-for-future-Boost.patch35
-rw-r--r--meta/recipes-devtools/cmake/cmake/0005-FindBoost-support-OPTIONAL_COMPONENTS.patch42
-rw-r--r--meta/recipes-devtools/cmake/cmake/0006-FindBoost-Add-support-for-Boost-1.67-with-Python-ver.patch296
4 files changed, 376 insertions, 0 deletions
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index 394c9ebb55..533db6ae86 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -20,6 +20,9 @@ SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
20 file://0001-FindBoost-Fix-incorrect-alphabetisation-of-headers-l.patch \ 20 file://0001-FindBoost-Fix-incorrect-alphabetisation-of-headers-l.patch \
21 file://0002-FindBoost-Implement-Architecture-and-Address-Model-t.patch \ 21 file://0002-FindBoost-Implement-Architecture-and-Address-Model-t.patch \
22 file://0003-FindBoost-Search-for-upstream-packaged-libs-next-to-.patch \ 22 file://0003-FindBoost-Search-for-upstream-packaged-libs-next-to-.patch \
23 file://0004-FindBoost-Generate-imported-targets-for-future-Boost.patch \
24 file://0005-FindBoost-support-OPTIONAL_COMPONENTS.patch \
25 file://0006-FindBoost-Add-support-for-Boost-1.67-with-Python-ver.patch \
23 " 26 "
24 27
25SRC_URI[md5sum] = "1c38c67295ca696aeafd8c059d748b38" 28SRC_URI[md5sum] = "1c38c67295ca696aeafd8c059d748b38"
diff --git a/meta/recipes-devtools/cmake/cmake/0004-FindBoost-Generate-imported-targets-for-future-Boost.patch b/meta/recipes-devtools/cmake/cmake/0004-FindBoost-Generate-imported-targets-for-future-Boost.patch
new file mode 100644
index 0000000000..bec04c4c14
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake/0004-FindBoost-Generate-imported-targets-for-future-Boost.patch
@@ -0,0 +1,35 @@
1From 6297d6c7fd6f80dafe17c0aefeeb0439432aa4b0 Mon Sep 17 00:00:00 2001
2From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com>
3Date: Sat, 30 Dec 2017 16:00:29 +1100
4Subject: [PATCH 4/6] FindBoost: Generate imported targets for future Boost
5 versions
6
7Per discussion on cmake/cmake#17575, this protection not particularly
8valuable, as the dependency information which the imported targets wrap
9is generated anyway.
10
11This removes a road-block for using `Boost_ADDITIONAL_VERSIONS` to
12support newly-released Boost versions pending a new CMake release.
13
14Affects cmake < 3.11.0
15
16Upsteam-Status: Backport
17[Yocto 12762]
18Signed-off-by: Armin Kuster <akuster808@gmail.com>
19
20---
21 Modules/FindBoost.cmake | 1 -
22 1 file changed, 1 deletion(-)
23
24Index: cmake-3.10.3/Modules/FindBoost.cmake
25===================================================================
26--- cmake-3.10.3.orig/Modules/FindBoost.cmake
27+++ cmake-3.10.3/Modules/FindBoost.cmake
28@@ -799,7 +799,6 @@ function(_Boost_COMPONENT_DEPENDENCIES c
29 endif()
30 if(NOT Boost_VERSION VERSION_LESS 106700)
31 message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")
32- set(_Boost_IMPORTED_TARGETS FALSE)
33 endif()
34 endif()
35
diff --git a/meta/recipes-devtools/cmake/cmake/0005-FindBoost-support-OPTIONAL_COMPONENTS.patch b/meta/recipes-devtools/cmake/cmake/0005-FindBoost-support-OPTIONAL_COMPONENTS.patch
new file mode 100644
index 0000000000..37d69ba080
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake/0005-FindBoost-support-OPTIONAL_COMPONENTS.patch
@@ -0,0 +1,42 @@
1From 2557cad5ec5084f86d4bb56c82939a49fc9d3071 Mon Sep 17 00:00:00 2001
2From: Sergiu Deitsch <sergiu.deitsch@gmail.com>
3Date: Sun, 14 Jan 2018 11:42:48 +0100
4Subject: [PATCH 5/6] FindBoost: support OPTIONAL_COMPONENTS
5
6Affects cmake < 3.11.0
7
8Upsteam-Status: Backport
9[Yocto 12762]
10Signed-off-by: Armin Kuster <akuster808@gmail.com>
11
12---
13 Modules/FindBoost.cmake | 8 +++++---
14 1 file changed, 5 insertions(+), 3 deletions(-)
15
16Index: cmake-3.10.3/Modules/FindBoost.cmake
17===================================================================
18--- cmake-3.10.3.orig/Modules/FindBoost.cmake
19+++ cmake-3.10.3/Modules/FindBoost.cmake
20@@ -13,6 +13,9 @@
21 # [version] [EXACT] # Minimum or EXACT version e.g. 1.36.0
22 # [REQUIRED] # Fail with error if Boost is not found
23 # [COMPONENTS <libs>...] # Boost libraries by their canonical name
24+# # e.g. "date_time" for "libboost_date_time"
25+# [OPTIONAL_COMPONENTS <libs>...]
26+# # Optional Boost libraries by their canonical name)
27 # ) # e.g. "date_time" for "libboost_date_time"
28 #
29 # This module finds headers and requested component libraries OR a CMake
30@@ -1783,10 +1786,9 @@ if(Boost_FOUND)
31 set(_boost_CHECKED_COMPONENT FALSE)
32 set(_Boost_MISSING_COMPONENTS "")
33 foreach(COMPONENT ${Boost_FIND_COMPONENTS})
34- string(TOUPPER ${COMPONENT} COMPONENT)
35+ string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
36 set(_boost_CHECKED_COMPONENT TRUE)
37- if(NOT Boost_${COMPONENT}_FOUND)
38- string(TOLOWER ${COMPONENT} COMPONENT)
39+ if(NOT Boost_${UPPERCOMPONENT}_FOUND AND Boost_FIND_REQUIRED_${COMPONENT})
40 list(APPEND _Boost_MISSING_COMPONENTS ${COMPONENT})
41 endif()
42 endforeach()
diff --git a/meta/recipes-devtools/cmake/cmake/0006-FindBoost-Add-support-for-Boost-1.67-with-Python-ver.patch b/meta/recipes-devtools/cmake/cmake/0006-FindBoost-Add-support-for-Boost-1.67-with-Python-ver.patch
new file mode 100644
index 0000000000..d25cd356d5
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake/0006-FindBoost-Add-support-for-Boost-1.67-with-Python-ver.patch
@@ -0,0 +1,296 @@
1From 1673923c303c6a4184904c4c5849911feddb87e7 Mon Sep 17 00:00:00 2001
2From: Roger Leigh <rleigh@codelibre.net>
3Date: Sun, 18 Mar 2018 13:05:35 +0000
4Subject: [PATCH 6/6] FindBoost: Add support for Boost 1.67 with Python version
5 suffixes
6
7Fixes: #16612, #16335, #16391, #12955
8
9Affects cmake < 3.11.0
10
11Upsteam-Status: Backport
12[Yocto 12762]
13Signed-off-by: Armin Kuster <akuster808@gmail.com>
14
15---
16 Modules/FindBoost.cmake | 170 ++++++++++++++++++++++++++++++++++++------------
17 1 file changed, 129 insertions(+), 41 deletions(-)
18
19Index: cmake-3.10.3/Modules/FindBoost.cmake
20===================================================================
21--- cmake-3.10.3.orig/Modules/FindBoost.cmake
22+++ cmake-3.10.3/Modules/FindBoost.cmake
23@@ -10,7 +10,7 @@
24 # Use this module by invoking find_package with the form::
25 #
26 # find_package(Boost
27-# [version] [EXACT] # Minimum or EXACT version e.g. 1.36.0
28+# [version] [EXACT] # Minimum or EXACT version e.g. 1.67.0
29 # [REQUIRED] # Fail with error if Boost is not found
30 # [COMPONENTS <libs>...] # Boost libraries by their canonical name
31 # # e.g. "date_time" for "libboost_date_time"
32@@ -40,6 +40,15 @@
33 # information about Boost's automatic linking
34 # displayed during compilation
35 #
36+# Note that Boost Python components require a Python version suffix
37+# (Boost 1.67 and later), e.g. ``python36`` or ``python27`` for the
38+# versions built against Python 3.6 and 2.7, respectively. This also
39+# applies to additional components using Python including
40+# ``mpi_python`` and ``numpy``. Earlier Boost releases may use
41+# distribution-specific suffixes such as ``2``, ``3`` or ``2.7``.
42+# These may also be used as suffixes, but note that they are not
43+# portable.
44+#
45 # This module reads hints about search locations from variables::
46 #
47 # BOOST_ROOT - Preferred installation prefix
48@@ -156,7 +165,7 @@
49 # Boost_REALPATH - Set to ON to resolve symlinks for discovered
50 # libraries to assist with packaging. For example,
51 # the "system" component library may be resolved to
52-# "/usr/lib/libboost_system.so.1.42.0" instead of
53+# "/usr/lib/libboost_system.so.1.67.0" instead of
54 # "/usr/lib/libboost_system.so". This does not
55 # affect linking and should not be enabled unless
56 # the user needs this information.
57@@ -190,6 +199,13 @@
58 # target_link_libraries(foo Boost::date_time Boost::filesystem
59 # Boost::iostreams)
60 #
61+# Example to find Boost Python 3.6 libraries and use imported targets::
62+#
63+# find_package(Boost 1.67 REQUIRED COMPONENTS
64+# python36 numpy36)
65+# add_executable(foo foo.cc)
66+# target_link_libraries(foo Boost::python36 Boost::numpy36)
67+#
68 # Example to find Boost headers and some *static* (release only) libraries::
69 #
70 # set(Boost_USE_STATIC_LIBS ON) # only find static libs
71@@ -197,7 +213,7 @@
72 # set(Boost_USE_RELEASE_LIBS ON) # only find release libs
73 # set(Boost_USE_MULTITHREADED ON)
74 # set(Boost_USE_STATIC_RUNTIME OFF)
75-# find_package(Boost 1.36.0 COMPONENTS date_time filesystem system ...)
76+# find_package(Boost 1.66.0 COMPONENTS date_time filesystem system ...)
77 # if(Boost_FOUND)
78 # include_directories(${Boost_INCLUDE_DIRS})
79 # add_executable(foo foo.cc)
80@@ -565,6 +581,13 @@ function(_Boost_COMPONENT_DEPENDENCIES c
81 # required only if the BoostScanDeps.cmake script logic is changed.
82 # The addition of a new release should only require it to be run
83 # against the new release.
84+
85+ # Handle Python version suffixes
86+ if(component MATCHES "^(python|mpi_python|numpy)([0-9][0-9]?|[0-9]\\.[0-9])\$")
87+ set(component "${CMAKE_MATCH_1}")
88+ set(component_python_version "${CMAKE_MATCH_2}")
89+ endif()
90+
91 set(_Boost_IMPORTED_TARGETS TRUE)
92 if(Boost_VERSION VERSION_LESS 103300)
93 message(WARNING "Imported targets and dependency information not available for Boost version ${Boost_VERSION} (all versions older than 1.33)")
94@@ -782,8 +805,7 @@ function(_Boost_COMPONENT_DEPENDENCIES c
95 set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
96 set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
97 set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
98- else()
99- if(NOT Boost_VERSION VERSION_LESS 106500)
100+ elseif(NOT Boost_VERSION VERSION_LESS 106500 AND Boost_VERSION VERSION_LESS 106700)
101 set(_Boost_CHRONO_DEPENDENCIES system)
102 set(_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time)
103 set(_Boost_COROUTINE_DEPENDENCIES context system)
104@@ -797,10 +819,29 @@ function(_Boost_COMPONENT_DEPENDENCIES c
105 set(_Boost_NUMPY_DEPENDENCIES python)
106 set(_Boost_RANDOM_DEPENDENCIES system)
107 set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
108+ set(_Boost_TIMER_DEPENDENCIES chrono system)
109 set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
110 set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
111- endif()
112+ else()
113 if(NOT Boost_VERSION VERSION_LESS 106700)
114+ set(_Boost_CHRONO_DEPENDENCIES system)
115+ set(_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time)
116+ set(_Boost_COROUTINE_DEPENDENCIES context system)
117+ set(_Boost_FIBER_DEPENDENCIES context thread chrono system date_time)
118+ set(_Boost_FILESYSTEM_DEPENDENCIES system)
119+ set(_Boost_IOSTREAMS_DEPENDENCIES regex)
120+ set(_Boost_LOG_DEPENDENCIES date_time log_setup system filesystem thread regex chrono atomic)
121+ set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l atomic)
122+ set(_Boost_MPI_DEPENDENCIES serialization)
123+ set(_Boost_MPI_PYTHON_DEPENDENCIES python${component_python_version} mpi serialization)
124+ set(_Boost_NUMPY_DEPENDENCIES python${component_python_version})
125+ set(_Boost_RANDOM_DEPENDENCIES system)
126+ set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
127+ set(_Boost_TIMER_DEPENDENCIES chrono system)
128+ set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic)
129+ set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
130+ endif()
131+ if(NOT Boost_VERSION VERSION_LESS 106800)
132 message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets")
133 endif()
134 endif()
135@@ -826,6 +867,12 @@ endfunction()
136 # _hdrs
137 #
138 function(_Boost_COMPONENT_HEADERS component _hdrs)
139+ # Handle Python version suffixes
140+ if(component MATCHES "^(python|mpi_python|numpy)([0-9][0-9]?|[0-9]\\.[0-9])\$")
141+ set(component "${CMAKE_MATCH_1}")
142+ set(component_python_version "${CMAKE_MATCH_2}")
143+ endif()
144+
145 # Note: new boost components will require adding here. The header
146 # must be present in all versions of Boost providing a library.
147 set(_Boost_ATOMIC_HEADERS "boost/atomic.hpp")
148@@ -1040,7 +1087,7 @@ else()
149 # _Boost_COMPONENT_HEADERS. See the instructions at the top of
150 # _Boost_COMPONENT_DEPENDENCIES.
151 set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
152- "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65"
153+ "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65"
154 "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
155 "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55"
156 "1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"
157@@ -1619,7 +1666,44 @@ foreach(COMPONENT ${Boost_FIND_COMPONENT
158 endforeach()
159 endif()
160
161+ # Handle Python version suffixes
162+ unset(COMPONENT_PYTHON_VERSION_MAJOR)
163+ unset(COMPONENT_PYTHON_VERSION_MINOR)
164+ if(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\$")
165+ set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}")
166+ set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}")
167+ elseif(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\\.?([0-9])\$")
168+ set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}")
169+ set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}")
170+ set(COMPONENT_PYTHON_VERSION_MINOR "${CMAKE_MATCH_3}")
171+ endif()
172+
173+ unset(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME)
174+ if (COMPONENT_PYTHON_VERSION_MINOR)
175+ # Boost >= 1.67
176+ list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
177+ # Debian/Ubuntu (Some versions omit the 2 and/or 3 from the suffix)
178+ list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}${COMPONENT_PYTHON_VERSION_MAJOR}-py${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
179+ list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-py${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
180+ # Gentoo
181+ list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
182+ # RPMs
183+ list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}-${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
184+ endif()
185+ if (COMPONENT_PYTHON_VERSION_MAJOR AND NOT COMPONENT_PYTHON_VERSION_MINOR)
186+ # Boost < 1.67
187+ list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME "${COMPONENT_UNVERSIONED}${COMPONENT_PYTHON_VERSION_MAJOR}")
188+ endif()
189+
190 # Consolidate and report component-specific hints.
191+ if(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME)
192+ list(REMOVE_DUPLICATES _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME)
193+ if(Boost_DEBUG)
194+ message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
195+ "Component-specific library search names for ${COMPONENT_NAME}: "
196+ "${_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME}")
197+ endif()
198+ endif()
199 if(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT)
200 list(REMOVE_DUPLICATES _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT)
201 if(Boost_DEBUG)
202@@ -1649,28 +1733,30 @@ foreach(COMPONENT ${Boost_FIND_COMPONENT
203 # Find RELEASE libraries
204 #
205 unset(_boost_RELEASE_NAMES)
206- foreach(compiler IN LISTS _boost_COMPILER)
207- list(APPEND _boost_RELEASE_NAMES
208- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
209- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} )
210- endforeach()
211- list(APPEND _boost_RELEASE_NAMES
212- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
213- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
214- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
215- if(_boost_STATIC_RUNTIME_WORKAROUND)
216- set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
217+ foreach(component IN LISTS _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME COMPONENT)
218 foreach(compiler IN LISTS _boost_COMPILER)
219 list(APPEND _boost_RELEASE_NAMES
220- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
221- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
222+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
223+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG} )
224 endforeach()
225 list(APPEND _boost_RELEASE_NAMES
226- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
227- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
228- endif()
229+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
230+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
231+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component} )
232+ if(_boost_STATIC_RUNTIME_WORKAROUND)
233+ set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
234+ foreach(compiler IN LISTS _boost_COMPILER)
235+ list(APPEND _boost_RELEASE_NAMES
236+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
237+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
238+ endforeach()
239+ list(APPEND _boost_RELEASE_NAMES
240+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
241+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
242+ endif()
243+ endforeach()
244 if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
245- _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
246+ _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
247 endif()
248 if(Boost_DEBUG)
249 message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
250@@ -1699,27 +1785,29 @@ foreach(COMPONENT ${Boost_FIND_COMPONENT
251 # Find DEBUG libraries
252 #
253 unset(_boost_DEBUG_NAMES)
254- foreach(compiler IN LISTS _boost_COMPILER)
255- list(APPEND _boost_DEBUG_NAMES
256- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
257- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} )
258- endforeach()
259- list(APPEND _boost_DEBUG_NAMES
260- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
261- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
262- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}
263- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
264- if(_boost_STATIC_RUNTIME_WORKAROUND)
265- set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
266+ foreach(component IN LISTS _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME COMPONENT)
267 foreach(compiler IN LISTS _boost_COMPILER)
268 list(APPEND _boost_DEBUG_NAMES
269- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
270- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
271+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
272+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG} )
273 endforeach()
274 list(APPEND _boost_DEBUG_NAMES
275- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
276- ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
277- endif()
278+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
279+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
280+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}
281+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component} )
282+ if(_boost_STATIC_RUNTIME_WORKAROUND)
283+ set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
284+ foreach(compiler IN LISTS _boost_COMPILER)
285+ list(APPEND _boost_DEBUG_NAMES
286+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
287+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${compiler}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
288+ endforeach()
289+ list(APPEND _boost_DEBUG_NAMES
290+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}${_boost_ARCHITECTURE_TAG}-${Boost_LIB_VERSION}
291+ ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${component}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
292+ endif()
293+ endforeach()
294 if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
295 _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
296 endif()
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-02 02:10:38 +0000