mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-11-13 03:37:15 +00:00
glaze: Install the CMake files in /usr/lib/cmake/glaze (as intended)
Commit 2330468507 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>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
1 parent
a5ec41f02d
commit
cf67981e76
1 file changed
+4
-2
@@ -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.
|
||||
|
||||
Reference in new issue
Block a user