]> code.ossystems Code Review - openembedded-core.git/commitdiff
cmake.bbclass: add ${base_libdir} to CMAKE_LIBRARY_PATH
authorNitin A Kamble <nitin.a.kamble@intel.com>
Mon, 12 Mar 2012 16:28:10 +0000 (09:28 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 12 Mar 2012 17:46:16 +0000 (17:46 +0000)
Some libraries like libcrypto.so are installed at base_libdir
instead of libdir. So add the base_libdir to CMAKE_LIBRARY_PATH
so that these libraries can be found correctly.

This resolves an issues with libzypp, which was not finding the
libcrypo library correctly in an x32 build.

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/cmake.bbclass

index 8aec759872e9a4399848250e7741944fa94385eb..dcd974ab2d106d72bd80c7fdc0ce5d72fc1115fd 100644 (file)
@@ -59,7 +59,7 @@ set( CMAKE_INSTALL_RPATH ${OECMAKE_RPATH} )
 set( CMAKE_MODULE_PATH ${STAGING_DATADIR}/cmake/Modules/ )
 
 # add for non /usr/lib libdir, e.g. /usr/lib64
-set( CMAKE_LIBRARY_PATH ${libdir} )
+set( CMAKE_LIBRARY_PATH ${libdir} ${base_libdir})
 
 EOF
 }