diff mbox series

[meta-oe,master,blacksail] glaze: Install the CMake files in /usr/lib/cmake/glaze (as intended)

Message ID 20261030143954.1209259-1-pkj@axis.com
State Accepted
Headers show
Series [meta-oe,master,blacksail] glaze: Install the CMake files in /usr/lib/cmake/glaze (as intended) | expand

Commit Message

Peter Kjellerstedt Oct. 30, 2026, 2:39 p.m. UTC 
Commit 23304685070f85c25af858beec06ada10fd9df79 aspired to move the
CMake files from /usr/share/glaze to /usr/lib/cmake/glaze. However, all
it did was remove the FILES:${PN}-dev assignment, which resulted in the
CMake files ending up in the target package.

Actually set the install path for the CMake files using
-Dglaze_INSTALL_CMAKEDIR:PATH. For some odd reason, it needs to be
realtive, or the installed files will not work as intended when
cross-compiling.

Also remove -DCMAKE_INSTALL_PREFIX and -DDESTDIR from EXTRA_OECMAKE as
they are already set correctly by cmake.bbclass.

Finally, restore -Dglaze_DEVELOPER_MODE=OFF. It does not seem to affect
the installed files, but generates less CMake rules.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---

Markus: Can you verify that your use case actually works now? Because
ours worked fine before and after.

 meta-oe/recipes-support/glaze/glaze_8.3.0.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/glaze/glaze_8.3.0.bb b/meta-oe/recipes-support/glaze/glaze_8.3.0.bb
index b393460c9f..e1bef79ba5 100644
--- a/meta-oe/recipes-support/glaze/glaze_8.3.0.bb
+++ b/meta-oe/recipes-support/glaze/glaze_8.3.0.bb
@@ -9,13 +9,15 @@  SRCREV = "dce5e0f7ec572725ec369a0bc59a00eeb2270a9a"
 
 inherit cmake
 
+# For some odd reason, glaze_INSTALL_CMAKEDIR must be relative, or the installed
+# files will not work as intended when cross-compiling.
 EXTRA_OECMAKE = " \
     -Dglaze_BUILD_EXAMPLES=OFF \
     -DBUILD_TESTING=OFF \
     -Dglaze_ENABLE_FUZZING=OFF \
+    -Dglaze_DEVELOPER_MODE=OFF \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=${prefix} \
-    -DDESTDIR=${D} \
+    -Dglaze_INSTALL_CMAKEDIR:PATH=${baselib}/cmake/${BPN} \
 "
 
 # Glaze is a header-only C++ library, so the main package will be empty.