[OE-core] [PATCH] 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.

[Jose Pardeiro]

Signed-off-by: Jose Pardeiro <jpardeiro at rapyuta-robotics.com>
---
 meta/classes/cmake.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 meta/classes/cmake.patch

diff --git a/meta/classes/cmake.patch b/meta/classes/cmake.patch
new file mode 100644
index 0000000..c9cc9f2
--- /dev/null
+++ b/meta/classes/cmake.patch
@@ -0,0 +1,20 @@
+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 at rapyuta-robotics.com>
+
+diff --git a/cmake.bbclass b/cmake.bbclass
+index 995ddf1..6de4247 100644
+--- a/meta/classes/cmake.bbclass
++++ b/meta/classes/cmake.bbclass
+@@ -60,7 +60,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/ )
++set( 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})
-- 
1.9.1