On Fri, 2024-08-23 at 15:50 +0200, Alexander Kanavin via lists.openembedded.org wrote: > From: Alexander Kanavin <[email protected]> > > Signed-off-by: Alexander Kanavin <[email protected]> > --- > ...o-not-obtain-wayland-scanner-path-fr.patch | 38 +++++++++++++++++++ > meta/recipes-graphics/piglit/piglit_git.bb | 1 + > 2 files changed, 39 insertions(+) > create mode 100644 > meta/recipes-graphics/piglit/piglit/0001-CMakeLists.txt-do-not-obtain-wayland-scanner-path-fr.patch > > diff --git > a/meta/recipes-graphics/piglit/piglit/0001-CMakeLists.txt-do-not-obtain-wayland-scanner-path-fr.patch > > b/meta/recipes-graphics/piglit/piglit/0001-CMakeLists.txt-do-not-obtain-wayland-scanner-path-fr.patch > new file mode 100644 > index 00000000000..b47e16af6b3 > --- /dev/null > +++ > b/meta/recipes-graphics/piglit/piglit/0001-CMakeLists.txt-do-not-obtain-wayland-scanner-path-fr.patch > @@ -0,0 +1,38 @@ > +From 8f25cdf54e35ab1a174cabf5078784b8e48bda01 Mon Sep 17 00:00:00 2001 > +From: Alexander Kanavin <[email protected]> > +Date: Fri, 23 Aug 2024 15:29:45 +0200 > +Subject: [PATCH] CMakeLists.txt: do not obtain wayland-scanner path from > + pkg-config > + > +cmake can only use target wayland-scanner.pc which (correctly) points to > /usr/bin/wayland-scanner > + > +However in cross builds it should be using wayland-scanner from native > sysroot, > +otherwise builds will break if wayland-scanner is not installed on the host > +distro. > + > +Upstream-Status: Inappropriate [yocto specific] > +Signed-off-by: Alexander Kanavin <[email protected]> > +--- > + CMakeLists.txt | 6 +----- > + 1 file changed, 1 insertion(+), 5 deletions(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index d169fb481..8394f5236 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -211,11 +211,7 @@ if(PIGLIT_USE_WAYLAND) > + message(FATAL_ERROR "Failed to find wayland-protocols XML path") > + endif() > + > +- pkg_check_modules(WaylandScanner REQUIRED wayland-scanner) > +- pkg_get_variable(WaylandScannerPath wayland-scanner wayland_scanner) > +- if (NOT WaylandScannerPath) > +- message(FATAL_ERROR "Failed to find wayland-scanner path from > pkg-config") > +- endif() > ++ set(WaylandScannerPath wayland-scanner) > + add_executable(WaylandScannerExe IMPORTED) > + set_property(TARGET WaylandScannerExe PROPERTY IMPORTED_LOCATION > ${WaylandScannerPath}) > + endif()
Is there any notion of cross compiling in cmake? This might be upstreamable if you could make "wayland-scanner" conditional upon cross compiling? Cheers, Richard
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#203699): https://lists.openembedded.org/g/openembedded-core/message/203699 Mute This Topic: https://lists.openembedded.org/mt/108056130/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
