From: Jose Pardeiro Date: Fri, 17 Jun 2016 15:01:17 +0000 (+0200) Subject: cmake.bbclass: set the modules directory correctly X-Git-Tag: uninative-1.3~587 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=642bd49964690259328f506df41a1764c5ac6226;p=openembedded-core.git cmake.bbclass: set the modules directory correctly The CMake recipes contain a mismatch between the environmental variable which defines where the Modules are installed and the location where they actually are. This patch fixes the environmental variable to point to the proper folder defined according to the cmake version. Signed-off-by: Jose Pardeiro Signed-off-by: Richard Purdie --- diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index e7883105da..6dbac2b75f 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass @@ -74,7 +74,7 @@ set( ENV{QT_CONF_PATH} ${WORKDIR}/qt.conf ) set( CMAKE_INSTALL_RPATH ${OECMAKE_RPATH} ) # Use native cmake modules -list(APPEND CMAKE_MODULE_PATH "${STAGING_DATADIR}/cmake/Modules/") +list(APPEND CMAKE_MODULE_PATH "${STAGING_DATADIR}/cmake-\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}/Modules/") # add for non /usr/lib libdir, e.g. /usr/lib64 set( CMAKE_LIBRARY_PATH ${libdir} ${base_libdir})