]> code.ossystems Code Review - openembedded-core.git/commitdiff
cmake-native: prefer native sysroot libraries over host
authorRoss Burton <ross.burton@intel.com>
Thu, 22 Sep 2016 16:11:47 +0000 (17:11 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 23 Sep 2016 13:55:39 +0000 (14:55 +0100)
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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-devtools/cmake/cmake-native_3.6.1.bb

index a301ae664cd696ba2e8e453e971c96200caa4282..aec0d64de110d8eda50fbb0126cc13e402df0b50 100644 (file)
@@ -12,6 +12,7 @@ do_configure[cleandirs] = "${B}"
 
 # Disable ccmake since we don't depend on ncurses
 CMAKE_EXTRACONF = "\
+    -DCMAKE_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \
     -DBUILD_CursesDialog=0 \
     -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
     -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \
@@ -21,7 +22,7 @@ CMAKE_EXTRACONF = "\
 "
 
 do_configure () {
-       ${S}/configure --prefix=${prefix} -- ${CMAKE_EXTRACONF}
+       ${S}/configure --verbose --prefix=${prefix} -- ${CMAKE_EXTRACONF}
 }
 
 do_compile() {