[OE-core] [PATCH v2] cmake.bbclass: set the modules directory correctly

[Jussi Kukkonen]

On 17 June 2016 at 18:01, Jose Pardeiro <jpardeiro at rapyuta-robotics.com>
wrote:
>
> 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.
>
> Signed-off-by: Jose Pardeiro <jpardeiro at rapyuta-robotics.com>
> ---
>  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 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/"


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)


>
>
>
>  # add for non /usr/lib libdir, e.g. /usr/lib64
>  set( CMAKE_LIBRARY_PATH ${libdir} ${base_libdir})
> --
> 1.9.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20160618/bd7b3d4e/attachment-0002.html>