[oe-commits] Ross Burton : cmake: extend CMAKE_MODULE_PATH instead of setting

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 2cfa8427d77f680df37c12d00125501ebe7c38a3
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2cfa8427d77f680df37c12d00125501ebe7c38a3

Author: Ross Burton <ross.burton at intel.com>
Date:   Thu Jun 11 14:33:56 2015 +0100

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 at intel.com>

---

 meta/classes/cmake.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 1ebb936..b0a3972 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})