diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-19 07:38:26 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-19 07:40:46 +0100 |
| commit | fba321ae9a1916d64f5c49c65c60c276f3346e7a (patch) | |
| tree | 006286101b803e48aa9361998c404ff721faf5b0 | |
| parent | 642bd49964690259328f506df41a1764c5ac6226 (diff) | |
| download | openembedded-core-fba321ae9a1916d64f5c49c65c60c276f3346e7a.tar.gz openembedded-core-fba321ae9a1916d64f5c49c65c60c276f3346e7a.tar.bz2 openembedded-core-fba321ae9a1916d64f5c49c65c60c276f3346e7a.zip | |
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
| -rw-r--r-- | 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 6dbac2b75f..e7883105da 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}) |