diff --git a/recipes-hawaii/hawaii-shell/hawaii-shell_git.bb b/recipes-hawaii/hawaii-shell/hawaii-shell_git.bb index a25c03d6..77b9de2d 100644 --- a/recipes-hawaii/hawaii-shell/hawaii-shell_git.bb +++ b/recipes-hawaii/hawaii-shell/hawaii-shell_git.bb @@ -5,15 +5,15 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.LGPL;md5=4fbd65380cdd255951079008b364516c \ " -inherit cmake_qt5 pythonnative +inherit cmake_qt5 pythonnative cmake-lib #inherit systemd SRC_URI = " \ git://github.com/hawaii-desktop/${BPN}.git;protocol=git;branch=master \ file://0001-find-host-s-git.patch \ " -SRCREV = "054fef1e7e2106850e697c3bf7256eb58245ee72" -PV = "0.4.92+git${SRCPV}" +SRCREV = "f5b93a89ca61f7240008ae610a70c0e2c9ace952" +PV = "0.4.93+git${SRCPV}" S = "${WORKDIR}/git" @@ -54,14 +54,23 @@ RRECOMMENDS_${PN} += " \ " FILES_${PN} += " \ - ${datadir} \ - ${libdir}/qml \ - ${libdir}/plugins \ - ${libdir}/systemd \ + ${datadir} \ + ${libdir}/qml \ + ${libdir}/plugins \ + ${libdir}/systemd \ " FILES_${PN}-dbg += " \ - ${libdir}/plugins/*/.debug \ - ${libdir}/qml/*/*/.debug \ - ${libdir}/qml/*/*/*/.debug \ + ${libdir}/plugins/*/.debug \ + ${libdir}/qml/*/*/.debug \ + ${libdir}/qml/*/*/*/.debug \ " + +FILES_${PN}-dev += " \ + ${libdir}/cmake \ +" + +# cross libs / headers +CMAKE_ALIGN_SYSROOT[1] = "Hawaii, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" +CMAKE_ALIGN_SYSROOT[2] = "Hawaii, -S${includedir}, -S${STAGING_INCDIR}" +