summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Pardeiro <jpardeiro@rapyuta-robotics.com>2016-06-17 17:01:17 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-17 17:12:22 +0100
commit642bd49964690259328f506df41a1764c5ac6226 (patch)
tree4d4ecb1a578071d7575fcd94592ea8bfcc40bd3d
parentbe5c943e82a21d3ef2dfaaa5b41b6a2814f2fb19 (diff)
downloadopenembedded-core-contrib-642bd49964690259328f506df41a1764c5ac6226.tar.gz
openembedded-core-contrib-642bd49964690259328f506df41a1764c5ac6226.tar.bz2
openembedded-core-contrib-642bd49964690259328f506df41a1764c5ac6226.zip
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 <jpardeiro@rapyuta-robotics.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 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})