diff options
author | Armin Kuster <akuster808@gmail.com> | 2018-06-03 15:22:18 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-07 08:52:13 +0100 |
commit | 2ff3d3296deacb9af4d9ad0b92cd7ba5f94b7182 (patch) | |
tree | e5b1a4f5f43471c8e2dbcc612d4b66232e28f078 /meta/recipes-devtools/cmake/cmake/0003-FindBoost-Search-for-upstream-packaged-libs-next-to-.patch | |
parent | 1d4f8b0b3f30f27b19fc91638d8d00e9545c1270 (diff) | |
download | openembedded-core-contrib-2ff3d3296deacb9af4d9ad0b92cd7ba5f94b7182.tar.gz |
cmake: fix build issue with boost 1.66.0
this fixes a build issue with boost 1.66.0
[Yocto 12762]
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-.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 @@ +From d56deff7d127b030739bd0034609d0046121d8cd Mon Sep 17 00:00:00 2001 +From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com> +Date: Fri, 29 Dec 2017 22:38:36 +1100 +Subject: [PATCH 3/6] FindBoost: Search for upstream-packaged libs next to + includes + +Upstream packages Boost binaries for Windows with the 'boost' directory +(the INCLUDE_DIR) next to the lib-... directory (the LIBRARY_DIR). + +Affects cmake < 3.11.0 + +Upsteam-Status: Backport +[Yocto 12762] +Signed-off-by: Armin Kuster <akuster808@gmail.com> + +--- + Modules/FindBoost.cmake | 1 + + 1 file changed, 1 insertion(+) + +Index: cmake-3.10.3/Modules/FindBoost.cmake +=================================================================== +--- cmake-3.10.3.orig/Modules/FindBoost.cmake ++++ cmake-3.10.3/Modules/FindBoost.cmake +@@ -1502,6 +1502,7 @@ foreach(c DEBUG RELEASE) + ${Boost_INCLUDE_DIR}/stage/lib + ) + _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "${Boost_INCLUDE_DIR}/..") ++ _Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS(_boost_LIBRARY_SEARCH_DIRS_${c} "${Boost_INCLUDE_DIR}") + if( Boost_NO_SYSTEM_PATHS ) + list(APPEND _boost_LIBRARY_SEARCH_DIRS_${c} NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH) + else() |