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

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

[Maxime Roussin-Bélanger]

I removed the version on the directory because it doesn't seems to be the philosophy
the support multiple version of the same package in an embedded system.

The following changes since commit 41d89552620bfbc94031d314e6b3d0324f7a330e:

  bitbake: fetch2: Avoid warning about incorrect character escaping in regex (2018-11-27 22:15:34 +0000)

are available in the Git repository at:

  git://git.yoctoproject.org/poky-contrib mroussin/remove_cmake_version
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=mroussin/remove_cmake_version

Maxime Roussin-Bélanger (1):
  cmake: remove version in directory structure

 meta/recipes-devtools/cmake/cmake-native_3.12.2.bb | 2 ++
 meta/recipes-devtools/cmake/cmake_3.12.2.bb        | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

-- 
2.19.2

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

[Maxime Roussin-Bélanger]

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.

Signed-off-by: Maxime Roussin-Bélanger <roussinm@sonatest.com>
---
 meta/recipes-devtools/cmake/cmake-native_3.12.2.bb | 2 ++
 meta/recipes-devtools/cmake/cmake_3.12.2.bb        | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/cmake/cmake-native_3.12.2.bb b/meta/recipes-devtools/cmake/cmake-native_3.12.2.bb
index 9a1390f96d..3e59012b48 100644
--- a/meta/recipes-devtools/cmake/cmake-native_3.12.2.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_3.12.2.bb
@@ -16,6 +16,8 @@ do_configure[cleandirs] = "${B}"
 # Disable ccmake since we don't depend on ncurses
 CMAKE_EXTRACONF = "\
     -DCMAKE_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \
+    -DCMAKE_DOC_DIR=doc/cmake \
+    -DCMAKE_DATA_DIR=share/cmake \
     -DBUILD_CursesDialog=0 \
     -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
     -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \
diff --git a/meta/recipes-devtools/cmake/cmake_3.12.2.bb b/meta/recipes-devtools/cmake/cmake_3.12.2.bb
index e0457677e8..0a3963b525 100644
--- a/meta/recipes-devtools/cmake/cmake_3.12.2.bb
+++ b/meta/recipes-devtools/cmake/cmake_3.12.2.bb
@@ -26,7 +26,8 @@ python () {
 }
 
 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 = ""
 
 BBCLASSEXTEND = "nativesdk"
-- 
2.19.2

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

[Burton, Ross]

On Thu, 29 Nov 2018 at 23:52, Maxime Roussin-Bélanger
<maxime.roussinbelanger@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?

>  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.

Ross

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

[Maxime Roussin-Bélanger]

[-- Attachment #1: Type: text/plain, Size: 2217 bytes --]

On Thu, Nov 29, 2018 at 6:55 PM Burton, Ross <ross.burton@intel.com> wrote:
>
> On Thu, 29 Nov 2018 at 23:52, Maxime Roussin-Bélanger
> <maxime.roussinbelanger@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

[-- Attachment #2: Type: text/html, Size: 2841 bytes --]

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

[Burton, Ross]

On Fri, 30 Nov 2018 at 01:30, Maxime Roussin-Bélanger
<maxime.roussinbelanger@gmail.com> wrote:
> > 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?

The context is useful, thanks.  Note that Debian does exactly the
same: cmake installs to /usr/lib/cmake-[version] and eigen installs to
/usr/lib/cmake/, and that works.  Is this a problem in general builds
or just the SDK?  Possibly our toolchain file is breaking the usual
lookup.

Ross

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

[Maxime Roussin-Bélanger]

[-- Attachment #1: Type: text/plain, Size: 799 bytes --]

On Fri, Nov 30, 2018 at 5:29 AM Burton, Ross <ross.burton@intel.com> wrote:
>
> On Fri, 30 Nov 2018 at 01:30, Maxime Roussin-Bélanger
> <maxime.roussinbelanger@gmail.com> wrote:
>
> The context is useful, thanks.  Note that Debian does exactly the
> same: cmake installs to /usr/lib/cmake-[version] and eigen installs to
> /usr/lib/cmake/, and that works.  Is this a problem in general builds
> or just the SDK?  Possibly our toolchain file is breaking the usual
> lookup.

Yes it works (in general builds) because inside cmake.bbclass there is that
line

`list(APPEND CMAKE_MODULE_PATH "${STAGING_DATADIR}/cmake/Modules/")`

But when you are using the SDK that path is not added. That means that all
library that
are installed inside that directory can't be found.

>
> Ross

[-- Attachment #2: Type: text/html, Size: 1156 bytes --]

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

[Scott Rifenbark]

[-- Attachment #1: Type: text/plain, Size: 1279 bytes --]

Ross,

Do these changes impact
https://bugzilla.yoctoproject.org/show_bug.cgi?id=12760 at all?  I was
looking into that bug regarding potential doc changes.

Scott

On Fri, Nov 30, 2018 at 7:49 AM Maxime Roussin-Bélanger <
maxime.roussinbelanger@gmail.com> wrote:

>
>
> On Fri, Nov 30, 2018 at 5:29 AM Burton, Ross <ross.burton@intel.com>
> wrote:
> >
> > On Fri, 30 Nov 2018 at 01:30, Maxime Roussin-Bélanger
> > <maxime.roussinbelanger@gmail.com> wrote:
> >
> > The context is useful, thanks.  Note that Debian does exactly the
> > same: cmake installs to /usr/lib/cmake-[version] and eigen installs to
> > /usr/lib/cmake/, and that works.  Is this a problem in general builds
> > or just the SDK?  Possibly our toolchain file is breaking the usual
> > lookup.
>
> Yes it works (in general builds) because inside cmake.bbclass there is
> that line
>
> `list(APPEND CMAKE_MODULE_PATH "${STAGING_DATADIR}/cmake/Modules/")`
>
> But when you are using the SDK that path is not added. That means that all
> library that
> are installed inside that directory can't be found.
>
> >
> > Ross
> --
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>

[-- Attachment #2: Type: text/html, Size: 2148 bytes --]

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

[Maxime Roussin-Bélanger]

[-- Attachment #1: Type: text/plain, Size: 423 bytes --]

On Fri, Nov 30, 2018 at 10:56 AM Scott Rifenbark <srifenbark@gmail.com>
wrote:
>
> Ross,
>
> Do these changes impact
https://bugzilla.yoctoproject.org/show_bug.cgi?id=12760 at all?  I was
looking into that bug regarding potential doc changes.
>
> Scott
>

Should I send a v2 with a better commit description? Or you want to
verify that Bugzilla ticket with Scott first?

I have an additional change to add.

[-- Attachment #2: Type: text/html, Size: 669 bytes --]