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-20 08:40:21 +0100 |
| commit | 09d08340fe0fca6f551c33d2fdcafb72f52812d2 (patch) | |
| tree | c600081d297e96e76e50433b3a1f485d6dd87d22 /meta/classes/cmake.bbclass | |
| parent | 7b9e1f5ad8a427356f2ec516b1718138a7d3c64e (diff) | |
| download | poky-09d08340fe0fca6f551c33d2fdcafb72f52812d2.tar.gz | |
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
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/cmake.bbclass')
| -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 ) | |||
| 74 | set( CMAKE_INSTALL_RPATH ${OECMAKE_RPATH} ) | 74 | set( CMAKE_INSTALL_RPATH ${OECMAKE_RPATH} ) |
| 75 | 75 | ||
| 76 | # Use native cmake modules | 76 | # Use native cmake modules |
| 77 | list(APPEND CMAKE_MODULE_PATH "${STAGING_DATADIR}/cmake-\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}/Modules/") | 77 | list(APPEND CMAKE_MODULE_PATH "${STAGING_DATADIR}/cmake/Modules/") |
| 78 | 78 | ||
| 79 | # add for non /usr/lib libdir, e.g. /usr/lib64 | 79 | # add for non /usr/lib libdir, e.g. /usr/lib64 |
| 80 | set( CMAKE_LIBRARY_PATH ${libdir} ${base_libdir}) | 80 | set( CMAKE_LIBRARY_PATH ${libdir} ${base_libdir}) |