summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-06-11 14:33:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-11 23:59:17 +0100
commit7b08012204e0a004b3d1f332df5bc3a250d71762 (patch)
treeb0bf6d66bf77fa0df4c9132b2df7e7339b329ccd /meta/classes
parentad0aa8d548e21e6e262c4b0d9fe7eb72b1b2c24f (diff)
downloadpoky-7b08012204e0a004b3d1f332df5bc3a250d71762.tar.gz
cmake: extend CMAKE_MODULE_PATH instead of setting
Some (e.g. piglit) CMakeList.txt files will extend CMAKE_MODULE_PATH before calling project(), which is when the toolchain.cmake file is parsed. In this situation the CMAKE_MODULE_PATH is overwritten, so handle this by appending in toolchain.cmake instead of assigning. (From OE-Core rev: 2cfa8427d77f680df37c12d00125501ebe7c38a3) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/cmake.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 1ebb9364d4..b0a3972d47 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -62,7 +62,7 @@ set( ENV{QT_CONF_PATH} ${WORKDIR}/qt.conf )
62set( CMAKE_INSTALL_RPATH ${OECMAKE_RPATH} ) 62set( CMAKE_INSTALL_RPATH ${OECMAKE_RPATH} )
63 63
64# Use native cmake modules 64# Use native cmake modules
65set( CMAKE_MODULE_PATH ${STAGING_DATADIR}/cmake/Modules/ ) 65list(APPEND CMAKE_MODULE_PATH "${STAGING_DATADIR}/cmake/Modules/")
66 66
67# add for non /usr/lib libdir, e.g. /usr/lib64 67# add for non /usr/lib libdir, e.g. /usr/lib64
68set( CMAKE_LIBRARY_PATH ${libdir} ${base_libdir}) 68set( CMAKE_LIBRARY_PATH ${libdir} ${base_libdir})