From ee9a61fb253c04c5edc7d8a0f9af5d01e744bf9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 31 Aug 2016 14:25:07 +0200
Subject: [PATCH] recipes-kde: further cmake-lib alignments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 recipes-kde/apps/baloo-widgets/baloo-widgets.bb       |  7 +------
 recipes-kde/apps/dolphin/dolphin.bb                   |  6 +-----
 recipes-kde/apps/libkdegames/libkdegames.bb           |  5 +----
 .../kf5/porting-aids-tier3/kjsembed/kjsembed.bb       |  2 +-
 recipes-kde/kf5/tier1/kconfig/kconfig.bb              |  2 +-
 recipes-kde/other/kpmcore/kpmcore_2.0.0.bb            |  6 +-----
 .../other/libdebconf-kde/libdebconf-kde_1.0.2.bb      |  6 +-----
 recipes-kde/other/libqapt/libqapt_3.0.1.bb            |  6 +-----
 recipes-kde/other/qca/qca_2.1.1.bb                    |  6 +-----
 recipes-kde/plasma/tier1/kdecoration/kdecoration.bb   |  6 +-----
 .../plasma/tier3/plasma-workspace/plasma-workspace.bb | 11 +----------
 recipes-kde/plasma/untier/discover/discover.bb        |  2 +-
 .../plasma/untier/kscreenlocker/kscreenlocker.bb      |  6 +-----
 recipes-kde/plasma/untier/libkscreen/libkscreen.bb    |  6 +-----
 .../plasma/untier/libksysguard/libksysguard.bb        |  6 +-----
 15 files changed, 15 insertions(+), 68 deletions(-)

diff --git a/recipes-kde/apps/baloo-widgets/baloo-widgets.bb b/recipes-kde/apps/baloo-widgets/baloo-widgets.bb
index 67b59c08..0aa6590a 100644
--- a/recipes-kde/apps/baloo-widgets/baloo-widgets.bb
+++ b/recipes-kde/apps/baloo-widgets/baloo-widgets.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
 "
 
-inherit kde-apps cmake-lib
+inherit kde-apps
 
 DEPENDS += "\
     kconfig \
@@ -20,8 +20,3 @@ DEPENDS += "\
 PV = "${KDE_APP_VERSION}"
 SRC_URI[md5sum] = "19fff67b67df658d9c5ee6258e431d92"
 SRC_URI[sha256sum] = "ed389a98418fd8faa796421c1529fe810bcf600b398c73a813e892f027074e35"
-
-# cross libs / headers
-CMAKE_ALIGN_SYSROOT[1] = "KF5BalooWidgets, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "KF5BalooWidgets, -S${includedir}, -S${STAGING_INCDIR}"
-
diff --git a/recipes-kde/apps/dolphin/dolphin.bb b/recipes-kde/apps/dolphin/dolphin.bb
index db30c4e3..2b1ccc40 100644
--- a/recipes-kde/apps/dolphin/dolphin.bb
+++ b/recipes-kde/apps/dolphin/dolphin.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps cmake-lib
+inherit kde-apps
 
 DEPENDS += " \
     kdoctools \
@@ -53,7 +53,3 @@ FILES_${PN} += " \
 FILES_${PN}-dbg += " \
     ${OE_QMAKE_PATH_PLUGINS}/.debug \
 "
-
-# cross libs / headers
-CMAKE_ALIGN_SYSROOT[1] = "DolphinVcs, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "DolphinVcs, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/apps/libkdegames/libkdegames.bb b/recipes-kde/apps/libkdegames/libkdegames.bb
index 1cd0d9c7..166990cb 100644
--- a/recipes-kde/apps/libkdegames/libkdegames.bb
+++ b/recipes-kde/apps/libkdegames/libkdegames.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \
 "
 
-inherit kde-apps cmake-lib
+inherit kde-apps
 
 DEPENDS += "\
     kcoreaddons \
@@ -56,6 +56,3 @@ FILES_${PN} += " \
 FILES_${PN}-dbg += " \
     ${OE_QMAKE_PATH_QML}/*/*/*/*/.debug \
 "
-
-CMAKE_ALIGN_SYSROOT[1] = "KF5KDEGames, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "KF5KDEGames, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb b/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb
index 550c6181..6a61920f 100644
--- a/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb
@@ -20,4 +20,4 @@ SRC_URI[md5sum] = "f1d0c9a46be19e69a493f75fc8af54e7"
 SRC_URI[sha256sum] = "d83f78bd15491d55f17d33f48c051cd3f6e37dcad382c7b460fb8132aadce1a9"
 
 # kjsembed's kjscmd5 is not required for build -> point to native dummy to make cmake happy
-CMAKE_ALIGN_SYSROOT[1] = "KF5JsEmbed, -S${bindir}/kjscmd5, -S${STAGING_BINDIR_NATIVE}/kjscmd5"
+CMAKE_ALIGN_SYSROOT[1] = "KF5JsEmbed, -s${_IMPORT_PREFIX}/bin/kjscmd5, -S${STAGING_BINDIR_NATIVE}/kjscmd5"
diff --git a/recipes-kde/kf5/tier1/kconfig/kconfig.bb b/recipes-kde/kf5/tier1/kconfig/kconfig.bb
index d1a9adb4..5b7e41da 100644
--- a/recipes-kde/kf5/tier1/kconfig/kconfig.bb
+++ b/recipes-kde/kf5/tier1/kconfig/kconfig.bb
@@ -7,7 +7,7 @@ DEPENDS += "${BPN}-native"
 SRC_URI += "file://0004-kconf_update-fix-paths.patch"
 
 # native executables
-CMAKE_ALIGN_SYSROOT[3] = "KF5Config, -s${_IMPORT_PREFIX}/libexec/kf5, -S${STAGING_LIBEXECDIR_NATIVE}/kf5"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Config, -s${_IMPORT_PREFIX}/libexec/kf5, -S${STAGING_LIBEXECDIR_NATIVE}/kf5"
 
 PACKAGES =+ "${PN}-bin"
 
diff --git a/recipes-kde/other/kpmcore/kpmcore_2.0.0.bb b/recipes-kde/other/kpmcore/kpmcore_2.0.0.bb
index 9a414420..bcd7bb65 100644
--- a/recipes-kde/other/kpmcore/kpmcore_2.0.0.bb
+++ b/recipes-kde/other/kpmcore/kpmcore_2.0.0.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
 "
 
-inherit kde-base cmake-lib pkgconfig
+inherit kde-base pkgconfig
 
 DEPENDS += " \
     ki18n \
@@ -20,10 +20,6 @@ SRC_URI = "${KDE_MIRROR}/stable/${BPN}/${PV}/src/${BPN}-${PV}.tar.xz"
 SRC_URI[md5sum] = "14570132ef88df21060198fdcc4b8e7a"
 SRC_URI[sha256sum] = "aa4a89c8a3745b2c06971f916aef30d87b3393a3b8c55ffc791cf46eb86b2454"
 
-# cross libs / headers
-CMAKE_ALIGN_SYSROOT[1] = "KPMcore, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "KPMcore, -S${includedir}, -S${STAGING_INCDIR}"
-
 FILES_${PN} += " \
     ${datadir}/k*5 \
     ${OE_QMAKE_PATH_PLUGINS} \
diff --git a/recipes-kde/other/libdebconf-kde/libdebconf-kde_1.0.2.bb b/recipes-kde/other/libdebconf-kde/libdebconf-kde_1.0.2.bb
index 17fb64cb..e519fad6 100644
--- a/recipes-kde/other/libdebconf-kde/libdebconf-kde_1.0.2.bb
+++ b/recipes-kde/other/libdebconf-kde/libdebconf-kde_1.0.2.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-inherit kde-base cmake-lib
+inherit kde-base
 
 DEPENDS += " \
     kcoreaddons \
@@ -17,7 +17,3 @@ DEPENDS += " \
 
 SRC_URI[md5sum] = "3680540e33a6cd1f5633fad2fdd93e56"
 SRC_URI[sha256sum] = "cd70ab39784d93bdb5e3ec856798bcf8b74b29ed99f41276c0cece868b95bb84"
-
-# cross libs / headers
-CMAKE_ALIGN_SYSROOT[1] = "DebconfKDE, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "DebconfKDE, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/other/libqapt/libqapt_3.0.1.bb b/recipes-kde/other/libqapt/libqapt_3.0.1.bb
index 77d19a95..68aa391d 100644
--- a/recipes-kde/other/libqapt/libqapt_3.0.1.bb
+++ b/recipes-kde/other/libqapt/libqapt_3.0.1.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
 "
 
-inherit kde-base cmake-lib
+inherit kde-base
 
 DEPENDS += " \
     xapian-core \
@@ -47,7 +47,3 @@ FILES_${PN} += " \
 FILES_${PN}-dbg += " \
     ${OE_QMAKE_PATH_PLUGINS}/.debug \
 "
-
-# cross libs / headers
-CMAKE_ALIGN_SYSROOT[1] = "QApt, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "QApt, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/other/qca/qca_2.1.1.bb b/recipes-kde/other/qca/qca_2.1.1.bb
index a4684bdd..898cbf08 100644
--- a/recipes-kde/other/qca/qca_2.1.1.bb
+++ b/recipes-kde/other/qca/qca_2.1.1.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING;md5=fbc093901857fcd118f065f900982c24 \
 "
 
-inherit kde-base cmake-lib
+inherit kde-base
 
 # TBD: PACKAGECONFIG
 DEPENDS += " \
@@ -26,7 +26,3 @@ EXTRA_OECMAKE += "-DQCA_FEATURE_INSTALL_DIR=${libdir}${QT_DIR_NAME}/mkspecs/feat
 
 FILES_${PN} += "${libdir}/qca-qt5/crypto"
 FILES_${PN}-dbg += "${libdir}/qca-qt5/crypto/.debug"
-
-# cross libs / headers
-CMAKE_ALIGN_SYSROOT[1] = "Qca-qt5, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "Qca-qt5, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb b/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb
index 2ba09b79..b61b5836 100644
--- a/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb
+++ b/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb
@@ -2,12 +2,8 @@ SUMMARY = "Plugin based library to create window decorations"
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
-inherit kde-plasma cmake-lib
+inherit kde-plasma
 
 PV = "${PLASMA_VERSION}"
 SRC_URI[md5sum] = "d72584ff8363c903ea58b2d56cab965f"
 SRC_URI[sha256sum] = "2c51ee6d2ddce21ba10ab15bc6f57ee3e453c943e64f7861443ba3dbece940cc"
-
-# cross libs / headers
-CMAKE_ALIGN_SYSROOT[1] = "KDecoration2, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "KDecoration2, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
index 9ee26263..0f248906 100644
--- a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
+++ b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-inherit kde-plasma cmake-lib distro_features_check
+inherit kde-plasma distro_features_check
 
 DEPENDS += " \
     baloo \
@@ -54,15 +54,6 @@ SRC_URI += " \
     file://0006-startkde-remove-CMAKE_INSTALL_PREFIX-in-XDG_DATA_DIR.patch \
 "
 
-# cross libs / headers
-CMAKE_ALIGN_SYSROOT[1] = "LibKWorkspace, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "LibKWorkspace, -S${includedir}, -S${STAGING_INCDIR}"
-CMAKE_ALIGN_SYSROOT[3] = "LibTaskManager, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[4] = "LibTaskManager, -S${includedir}, -S${STAGING_INCDIR}"
-CMAKE_ALIGN_SYSROOT[5] = "LibLegacyTaskManager, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[6] = "LibLegacyTaskManager, -S${includedir}, -S${STAGING_INCDIR}"
-
-
 # REVISIT
 FILES_${PN} += " \
     ${datadir}/config.kcfg \
diff --git a/recipes-kde/plasma/untier/discover/discover.bb b/recipes-kde/plasma/untier/discover/discover.bb
index bc968ede..47e54585 100644
--- a/recipes-kde/plasma/untier/discover/discover.bb
+++ b/recipes-kde/plasma/untier/discover/discover.bb
@@ -3,7 +3,7 @@ require ${BPN}.inc
 inherit gtk-icon-cache
 
 DEPENDS += " \
-	${BPN}-native \
+    ${BPN}-native \
     qtsvg \
     qtdeclarative \
     \
diff --git a/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb b/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb
index 7deb7cb9..91327f14 100644
--- a/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb
+++ b/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-inherit kde-plasma distro_features_check cmake-lib
+inherit kde-plasma distro_features_check
 
 DEPENDS += " \
     plasma-framework \
@@ -45,7 +45,3 @@ FILES_${PN} += " \
 FILES_${PN}-dbg += " \
     ${OE_QMAKE_PATH_PLUGINS}/.debug \
 "
-
-# cross libs / headers
-CMAKE_ALIGN_SYSROOT[1] = "KScreenLocker, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "KScreenLocker, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/plasma/untier/libkscreen/libkscreen.bb b/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
index 18235246..fd8f41fc 100644
--- a/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
+++ b/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 "
 
-inherit kde-plasma cmake-lib
+inherit kde-plasma
 
 DEPENDS += " \
     kwayland \
@@ -32,7 +32,3 @@ FILES_${PN}-dbg += " \
     ${OE_QMAKE_PATH_PLUGINS}/kf5/kscreen/.debug \
     ${libexecdir}/kf5/.debug \
 "
-
-CMAKE_ALIGN_SYSROOT[1] = "KF5Screen, -S${includedir}, -S${STAGING_INCDIR}"
-CMAKE_ALIGN_SYSROOT[2] = "KF5Screen, -S${libdir}, -S${STAGING_LIBDIR}"
-
diff --git a/recipes-kde/plasma/untier/libksysguard/libksysguard.bb b/recipes-kde/plasma/untier/libksysguard/libksysguard.bb
index 6f040e9c..e30fae98 100644
--- a/recipes-kde/plasma/untier/libksysguard/libksysguard.bb
+++ b/recipes-kde/plasma/untier/libksysguard/libksysguard.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
     file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 "
 
-inherit kde-plasma cmake-lib
+inherit kde-plasma
 
 DEPENDS += " \
     qtwebkit \
@@ -28,10 +28,6 @@ PV = "${PLASMA_VERSION}"
 SRC_URI[md5sum] = "2c1234454ea8ca8f58de237600674959"
 SRC_URI[sha256sum] = "caf32ad1936bfb45d31b5f6ceb01849ccf191f5c62872007c82becad27e599bd"
 
-# cross libs / headers
-CMAKE_ALIGN_SYSROOT[1] = "KF5SysGuard, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_ALIGN_SYSROOT[2] = "KF5SysGuard, -S${includedir}, -S${STAGING_INCDIR}"
-
 FILES_${PN} += " \
     ${datadir}/dbus-1 \
     ${datadir}/polkit-1 \