diff options
author | Ross Burton <ross.burton@intel.com> | 2016-09-22 17:11:47 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-23 14:56:39 +0100 |
commit | 8aa8d1459272b1158b415014b89bffbe99cc05c8 (patch) | |
tree | d5af3fdebdea21cb58ff1bb078000c2160c8d89a /meta/recipes-devtools/cmake | |
parent | 49d4477d53639d6f4e484435eabcb8c5d95cfdbd (diff) | |
download | poky-8aa8d1459272b1158b415014b89bffbe99cc05c8.tar.gz |
cmake-native: prefer native sysroot libraries over host
Explicitly set CMAKE_LIBRARY_PATH so that find_library() looks in the native
sysroot before the host.
Also pass --verbose to configure which sets CMAKE_VERBOSE_MAKEFILE for detailed
compile logs.
(From OE-Core rev: 89b28990ff3ef8ac7a33a0a3f9177b9bd0e1530b)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/cmake')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake-native_3.6.1.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.6.1.bb b/meta/recipes-devtools/cmake/cmake-native_3.6.1.bb index a301ae664c..aec0d64de1 100644 --- a/meta/recipes-devtools/cmake/cmake-native_3.6.1.bb +++ b/meta/recipes-devtools/cmake/cmake-native_3.6.1.bb | |||
@@ -12,6 +12,7 @@ do_configure[cleandirs] = "${B}" | |||
12 | 12 | ||
13 | # Disable ccmake since we don't depend on ncurses | 13 | # Disable ccmake since we don't depend on ncurses |
14 | CMAKE_EXTRACONF = "\ | 14 | CMAKE_EXTRACONF = "\ |
15 | -DCMAKE_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \ | ||
15 | -DBUILD_CursesDialog=0 \ | 16 | -DBUILD_CursesDialog=0 \ |
16 | -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ | 17 | -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ |
17 | -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ | 18 | -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ |
@@ -21,7 +22,7 @@ CMAKE_EXTRACONF = "\ | |||
21 | " | 22 | " |
22 | 23 | ||
23 | do_configure () { | 24 | do_configure () { |
24 | ${S}/configure --prefix=${prefix} -- ${CMAKE_EXTRACONF} | 25 | ${S}/configure --verbose --prefix=${prefix} -- ${CMAKE_EXTRACONF} |
25 | } | 26 | } |
26 | 27 | ||
27 | do_compile() { | 28 | do_compile() { |