diff options
| author |   Ross Burton <ross.burton@intel.com> | 2015-06-11 14:33:56 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-11 23:57:51 +0100 |
| commit | 2cfa8427d77f680df37c12d00125501ebe7c38a3 (patch) | |
| tree | 56a086d634ab2af5989c7a988109108b9e949833 | |
| parent | c6fe26ade5734efb5250e00c56fdbb4095b0018b (diff) | |
| download | openembedded-core-contrib-2cfa8427d77f680df37c12d00125501ebe7c38a3.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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/classes/cmake.bbclass | 2 |
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 ) set( CMAKE_INSTALL_RPATH ${OECMAKE_RPATH} ) # Use native cmake modules -set( CMAKE_MODULE_PATH ${STAGING_DATADIR}/cmake/Modules/ ) +list(APPEND CMAKE_MODULE_PATH "${STAGING_DATADIR}/cmake/Modules/") # add for non /usr/lib libdir, e.g. /usr/lib64 set( CMAKE_LIBRARY_PATH ${libdir} ${base_libdir}) |