kde-kf5: remove cross cmake-lib usages

With oe-core's:
commit c03b32bd71dbe04f2f239556fea0b53215e403d7
Author: Thomas Witt <Thomas.Witt@bmw.de>
Date:   Mon Aug 22 16:27:11 2016 +0200

    cmake.bbclass: call cmake with a relative path

    CMake wants a relative path for CMAKE_INSTALL_*DIR, an absolute path
    breaks cross-compilation. This fact is documented in the following
    ticket: https://cmake.org/Bug/view.php?id=14367

    $sysconfdir and $localstatedir are not relative to $prefix, so they are
    still set as absolute paths. With his change ${PROJECT}Targets.cmake
    that are generated by cmakes "export" function will contain relative
    paths instead of absolute ones.

    Signed-off-by: Thomas Witt <Thomas.Witt@bmw.de>
    Signed-off-by: Clemens Lang <clemens.lang@bmw-carit.de>
    Signed-off-by: Ross Burton <ross.burton@intel.com>

the hacky sysroot replacements are no more necessary.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2016-08-30 18:31:43 +02:00
parent 81162a93a1
commit 73bf6f0742
65 changed files with 63 additions and 322 deletions

View File

@@ -2,7 +2,7 @@ SUMMARY = "Workspace and cross-framework integration plugins"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
inherit kde-kf5 cmake-lib
inherit kde-kf5
DEPENDS += " \
kconfig \
@@ -20,10 +20,6 @@ PV = "${KF5_VERSION}"
SRC_URI[md5sum] = "d63e9454ee42955c44cad1cc78a98d44"
SRC_URI[sha256sum] = "ea9ccb564aa1cebdd7ad3dbd5168cb1ae750f20122918864d846990828057653"
# cross libs / headers
CMAKE_ALIGN_SYSROOT[1] = "KF5FrameworkIntegration, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
CMAKE_ALIGN_SYSROOT[2] = "KF5FrameworkIntegration, -S${includedir}, -S${STAGING_INCDIR}"
FILES_${PN} += " \
${datadir}/knotifications5 \
${datadir}/kconf_update \