From 859bbdac053b749862a412234788c20e745b3ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 26 Jan 2020 17:50:59 +0100 Subject: [PATCH] kwindowsystem: get rid of cmake_auto_align_paths & cmake_lib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../kf5/tier1/kwindowsystem/kwindowsystem.bb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb b/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb index a39f150f..54675f5f 100644 --- a/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb +++ b/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb @@ -1,10 +1,8 @@ SUMMARY = "Access to the windowing system" LICENSE = "GPLv2 | LGPLv2.1" -LIC_FILES_CHKSUM = " \ - file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ -" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" -inherit kde-kf5 cmake_auto_align_paths cmake_lib +inherit kde-kf5 DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras libxrender libxfixes libxfixes-native", "", d)}" @@ -12,6 +10,11 @@ PV = "${KF5_VERSION}" SRC_URI[md5sum] = "784dd55a5b912d8023f01930867b9848" SRC_URI[sha256sum] = "416e2ba52a8c95a6b161ca306724525c1971723cb12e7d8ad7fa108e0b820f0c" -CMAKE_ALIGN_SYSROOT[1] = "KF5WindowSystem, -S${includedir}, -s${_IMPORT_PREFIX}/include" +do_configure_append() { + # remove absolute paths from exported cmake files + for f in `find ${B} -name '*Targets*.cmake'`; do + sed -i 's:${RECIPE_SYSROOT}${prefix}:${_IMPORT_PREFIX}:g' $f + done +} FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}"