diff options
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-.patch | 31 |
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 @@ | |||
1 | From d56deff7d127b030739bd0034609d0046121d8cd Mon Sep 17 00:00:00 2001 | ||
2 | From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com> | ||
3 | Date: Fri, 29 Dec 2017 22:38:36 +1100 | ||
4 | Subject: [PATCH 3/6] FindBoost: Search for upstream-packaged libs next to | ||
5 | includes | ||
6 | |||
7 | Upstream packages Boost binaries for Windows with the 'boost' directory | ||
8 | (the INCLUDE_DIR) next to the lib-... directory (the LIBRARY_DIR). | ||
9 | |||
10 | Affects cmake < 3.11.0 | ||
11 | |||
12 | Upsteam-Status: Backport | ||
13 | [Yocto 12762] | ||
14 | Signed-off-by: Armin Kuster <akuster808@gmail.com> | ||
15 | |||
16 | --- | ||
17 | Modules/FindBoost.cmake | 1 + | ||
18 | 1 file changed, 1 insertion(+) | ||
19 | |||
20 | Index: 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() | ||