[poky] [PULL][PATCH 1/1] cmake: remove version in directory structure

[Maxime Roussin-Bélanger]

On Thu, Nov 29, 2018 at 6:55 PM Burton, Ross <ross.burton at intel.com> wrote:
>
> On Thu, 29 Nov 2018 at 23:52, Maxime Roussin-Bélanger
> <maxime.roussinbelanger at gmail.com> wrote:
> > Remove the number because I don't think it's worth
> > supporting multiple version of cmake inside an embedded
> > product.
> >
> > When using an SDK, using 2 different CMake is probably not a
> > use case.
>
> Whilst that's a hard point to argue with, what's the problem that's
> being solved here?


If CMake is in the cmake-x.xx directory and then there is libeigen that
adds their own cmake modules to the cmake/modules.

So now you have the cmake modules inside cmake-x.xx/Modules and some in
cmake/modules. Your project will have to update the CMAKE_MODULE_PATH,
if they wanna use libeigen.

Well, I think that's how it works. All of the recipes that want to add
their own
module they have to use `cmake/Modules`, because they can't possibly know
which cmake version we are using.

So I thought maybe put them all in the same directory so no one
has to deal with the fact that 2 directories are used for the same thing.

Less confusing?

>
> >  EXTRA_OECMAKE=" \
> > -    -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \
> > +    -DCMAKE_DOC_DIR=${docdir_stripped}/cmake \
> > +    -DCMAKE_DATA_DIR=share/cmake \
> >      -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
> >      -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \
> >      -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 \
> > @@ -46,8 +47,8 @@ do_install_append_class-nativesdk() {
> >
> >  FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}"
> >
> > -FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION}
${datadir}/cmake ${datadir}/aclocal"
> > -FILES_${PN}-doc += "${docdir}/cmake-${CMAKE_MAJOR_VERSION}"
> > +FILES_${PN} += "${datadir}/cmake ${datadir}/aclocal"
> > +FILES_${PN}-doc += "${docdir}/cmake"
> >  FILES_${PN}-dev = ""
>
> If the distro has set $datadir to something other than the default
> then -DCMAKE_DATA_DIR=share/cmake won't match FILES_${PN} +=
> ${datadir}/cmake, you need to do the same calculation that
> docdir_stripped already does.


Thanks didn't know about that.

>
>
> Ross


Max
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.yoctoproject.org/pipermail/poky/attachments/20181129/ba6f2d8b/attachment.html>