[gnome-continuous-yocto/gnomeostree-3.28-rocko: 997/8267] cmake.bbclass: set the modules directory correctly



commit 7b9e1f5ad8a427356f2ec516b1718138a7d3c64e
Author: Jose Pardeiro <jpardeiro rapyuta-robotics com>
Date:   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.
    
    (From OE-Core rev: 642bd49964690259328f506df41a1764c5ac6226)
    
    Signed-off-by: Jose Pardeiro <jpardeiro rapyuta-robotics com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/cmake.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
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})


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]