diff options
| author |   Jose Pardeiro <jpardeiro@rapyuta-robotics.com> | 2016-06-17 17:01:17 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-17 17:14:55 +0100 |
| commit | 7b9e1f5ad8a427356f2ec516b1718138a7d3c64e (patch) | |
| tree | 99e3f385012cba5c8720d2ec957ba6ca7079fdf4 /meta/classes | |
| parent | 8f7f8f7cfa80dc2e1af721388946a28cfdaca1dc (diff) | |
| download | openembedded-core-contrib-7b9e1f5ad8a427356f2ec516b1718138a7d3c64e.tar.gz | |
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>
Diffstat (limited to 'meta/classes')
| -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 e7883105da..6dbac2b75f 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}) |