cmake_qt5_extra: pack cmake files to -dev packages

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2017-06-13 14:47:45 +02:00
parent eef9a5b847
commit 98dcc8504d
9 changed files with 5 additions and 13 deletions
--- a/classes/cmake_qt5_extra.bbclass
+++ b/classes/cmake_qt5_extra.bbclass
@@ -3,3 +3,5 @@ inherit cmake_qt5 cmake_extra_sanity
 EXTRA_OECMAKE += " \
    -DCMAKE_QT5_EX_PATH_HOST_HEADERS=${STAGING_INCDIR} \
 "
+
+FILES_${PN}-dev += "${datadir}/cmake ${libdir}/cmake"
--- a/recipes-liri/fluid/fluid_git.bb
+++ b/recipes-liri/fluid/fluid_git.bb
@@ -23,6 +23,5 @@ do_configure_prepend() {

 FILES_${PN} += "${OE_QMAKE_PATH_QML}"
 FILES_${PN}-dev += " \
-    ${libdir}/cmake \
    ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs \
 "
--- a/recipes-liri/liri-settings/liri-settings_git.bb
+++ b/recipes-liri/liri-settings/liri-settings_git.bb
@@ -33,10 +33,6 @@ FILES_${PN}-dbg += " \
    ${OE_QMAKE_PATH_QML}/Liri/*/.debug \
 "

-FILES_${PN}-dev += " \
-    ${libdir}/cmake \
-"
-
 # cross libs / headers
 CMAKE_ALIGN_SYSROOT[1] = "LiriSettings, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 CMAKE_ALIGN_SYSROOT[2] = "LiriSettings, -S${includedir}, -S${STAGING_INCDIR}"
--- a/recipes-liri/liri-wayland/liri-wayland_git.bb
+++ b/recipes-liri/liri-wayland/liri-wayland_git.bb
@@ -56,6 +56,5 @@ FILES_${PN}-dbg += " \
 "

 FILES_${PN}-dev += " \
-    ${libdir}/cmake \
    ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs \
 "
--- a/recipes-liri/qtaccountsservice/qtaccountsservice_git.bb
+++ b/recipes-liri/qtaccountsservice/qtaccountsservice_git.bb
@@ -13,7 +13,6 @@ S = "${WORKDIR}/git"

 FILES_${PN} += "${OE_QMAKE_PATH_QML}/QtAccountsService"
 FILES_${PN}-dbg += "${OE_QMAKE_PATH_QML}/QtAccountsService/.debug"
-FILES_${PN}-dev += "${libdir}/cmake"

 CMAKE_ALIGN_SYSROOT[1] = "QtAccountsService, -S${includedir}, -S${STAGING_INCDIR}"
 CMAKE_ALIGN_SYSROOT[2] = "QtAccountsService, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
--- a/recipes-liri/vibe/vibe_git.bb
+++ b/recipes-liri/vibe/vibe_git.bb
@@ -28,7 +28,6 @@ DEPENDS += " \
 RDEPENDS_${PN} += "pulseaudio-server"

 FILES_${PN} += "${OE_QMAKE_PATH_QML}"
-FILES_${PN}-dev += "${libdir}/cmake"

 RREPLACES_${PN} = "libhawaii"
 RPROVIDES_${PN} = "libhawaii"
--- a/recipes-lxqt/lxqt-build-tools/lxqt-build-tools_git.bb
+++ b/recipes-lxqt/lxqt-build-tools/lxqt-build-tools_git.bb
@@ -3,7 +3,7 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://BSD-3-Clause;md5=a8987c1fd6930fe14ae46b4d72e53770"

 # lxqt.bbclass adds an inherit on this recipe
-inherit cmake_qt5 cmake_extra_sanity
+inherit cmake_qt5_extra

 do_configure_append() {
    sed -i 's:set(LXQT_ETC_XDG_DIR.*:set(LXQT_ETC_XDG_DIR        "${sysconfdir}/xdg"):' ${B}/install/LXQtConfigVars.cmake
--- a/recipes-misc/recipes-graphics/sddm/sddm_git.bb
+++ b/recipes-misc/recipes-graphics/sddm/sddm_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \

 REQUIRED_DISTRO_FEATURES = "x11"

-inherit cmake_qt5 cmake_extra_sanity pkgconfig systemd useradd distro_features_check
+inherit cmake_qt5_extra pkgconfig systemd useradd distro_features_check

 DEPENDS += "extra-cmake-modules-native qtbase qtdeclarative qttools libxcb"
 # REVISIT optionals
--- a/recipes-support/libdbusmenu-qt5/libdbusmenu-qt5_0.9.3+16.04.20160218.bb
+++ b/recipes-support/libdbusmenu-qt5/libdbusmenu-qt5_0.9.3+16.04.20160218.bb
@@ -7,7 +7,7 @@ SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/libd/libdbusmenu-qt/libdbu
 SRC_URI[md5sum] = "8b90312bd8654e026d814d4db986ce5e"
 SRC_URI[sha256sum] = "a8e6358a31c44ccdf1bfc46c95a77a6bfc7fc1f536aadb913ed4f4405c570cf6"

-inherit cmake_qt5 cmake_extra_sanity
+inherit cmake_qt5_extra

 S = "${WORKDIR}/libdbusmenu-qt-${PV}"

@@ -15,5 +15,3 @@ EXTRA_OECMAKE += " \
    -DUSE_QT5=On \
    -DWITH_DOC=OFF \
 "
-
-FILES_${PN}-dev += "${libdir}/cmake"