[oe-commits] [openembedded-core] 05/05: cmake.bbclass: set the modules directory correctly

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 642bd49964690259328f506df41a1764c5ac6226
Author: Jose Pardeiro <jpardeiro at rapyuta-robotics.com>
AuthorDate: Fri Jun 17 17:01:17 2016 +0200

    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 at rapyuta-robotics.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 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 e788310..6dbac2b 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})

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.