From 2cfa8427d77f680df37c12d00125501ebe7c38a3 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 11 Jun 2015 14:33:56 +0100 Subject: 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 --- meta/classes/cmake.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes/cmake.bbclass') 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}) -- cgit 1.2.3-korg