[oe-commits] [openembedded-core] branch master-next updated: Revert "cmake.bbclass: set the modules directory correctly"

[git at git.openembedded.org]

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

The following commit(s) were added to refs/heads/master-next by this push:
       new  fc1840c   Revert "cmake.bbclass: set the modules directory correctly"
fc1840c is described below

commit fc1840cc6010bc012d2edb8d8f2b1db1e0f3667d
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Sun Jun 19 07:38:26 2016 +0100

    Revert "cmake.bbclass: set the modules directory correctly"
    
    This reverts commit 642bd49964690259328f506df41a1764c5ac6226.
    
    This broke "bitbake cmake":
    
    | CMake Error at /home/jku/src/poky/build/tmp/work/core2-64-poky-linux/cmake/3.5.2-r0/toolchain.cmake:34 (list):
    |   Syntax error in cmake code at
    |
    |     /home/jku/src/poky/build/tmp/work/core2-64-poky-linux/cmake/3.5.2-r0/toolchain.cmake:34
    |
    |   when parsing string
    |
    |     /home/jku/src/poky/build/tmp/sysroots/qemux86-64/usr/share/cmake-\3.5.${CMAKE_MINOR_VERSION}/Modules/
    |
    |   Invalid character escape '\3'.
    | Call Stack (most recent call first):
    |   /home/jku/src/poky/build/tmp/sysroots/x86_64-linux/usr/share/cmake-3.5/Modules/CMakeDetermineSystem.cmake:98 (include)
    |   CMakeLists.txt:19 (project)
    
    https://autobuilder.yoctoproject.org/main/builders/nightly-world/builds/832
    https://autobuilder.yoctoproject.org/main/builders/nightly-world-lsb/builds/550
---
 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 6dbac2b..e788310 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-\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}/Modules/")
+list(APPEND CMAKE_MODULE_PATH "${STAGING_DATADIR}/cmake/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.