summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/cmake/cmake/0003-FindBoost-Search-for-upstream-packaged-libs-next-to-.patch
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-06-03 15:22:18 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-07 08:52:55 +0100
commit5dbcf72c6466c96e51d803e499e4e2184250aaa8 (patch)
tree821d3ec22f46b4fce530e0238ac1d6545c7f8be5 /meta/recipes-devtools/cmake/cmake/0003-FindBoost-Search-for-upstream-packaged-libs-next-to-.patch
parent74e03045a0f0ce73bff36e3cd08eae9a37d6058e (diff)
downloadpoky-5dbcf72c6466c96e51d803e499e4e2184250aaa8.tar.gz
cmake: fix build issue with boost 1.66.0
this fixes a build issue with boost 1.66.0 [Yocto 12762] (From OE-Core rev: 2ff3d3296deacb9af4d9ad0b92cd7ba5f94b7182) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/cmake/cmake/0003-FindBoost-Search-for-upstream-packaged-libs-next-to-.patch')
-rw-r--r--meta/recipes-devtools/cmake/cmake/0003-FindBoost-Search-for-upstream-packaged-libs-next-to-.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-devtools/cmake/cmake/0003-FindBoost-Search-for-upstream-packaged-libs-next-to-.patch b/meta/recipes-devtools/cmake/cmake/0003-FindBoost-Search-for-upstream-packaged-libs-next-to-.patch
new file mode 100644
index 0000000000..5178f5c4dc
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake/0003-FindBoost-Search-for-upstream-packaged-libs-next-to-.patch
@@ -0,0 +1,31 @@
1From d56deff7d127b030739bd0034609d0046121d8cd Mon Sep 17 00:00:00 2001
2From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com>
3Date: Fri, 29 Dec 2017 22:38:36 +1100
4Subject: [PATCH 3/6] FindBoost: Search for upstream-packaged libs next to
5 includes
6
7Upstream packages Boost binaries for Windows with the 'boost' directory
8(the INCLUDE_DIR) next to the lib-... directory (the LIBRARY_DIR).
9
10Affects cmake < 3.11.0
11
12Upsteam-Status: Backport
13[Yocto 12762]
14Signed-off-by: Armin Kuster <akuster808@gmail.com>
15
16---
17 Modules/FindBoost.cmake | 1 +
18 1 file changed, 1 insertion(+)
19
20Index: cmake-3.10.3/Modules/FindBoost.cmake
21===================================================================
22--- cmake-3.10.3.orig/Modules/FindBoost.cmake
23+++ cmake-3.10.3/Modules/FindBoost.cmake
24@@ -1502,6 +1502,7 @@ foreach(c DEBUG RELEASE)
25 ${Boost_INCLUDE_DIR}/stage/lib
26 )
27 _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "${Boost_INCLUDE_DIR}/..")
28+ _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "${Boost_INCLUDE_DIR}")
29 if( Boost_NO_SYSTEM_PATHS )
30 list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH)
31 else()