From eef9a5b847cedfaad74ea04baa076ee699e2e640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 13 Jun 2017 14:43:51 +0200 Subject: [PATCH] cmake_qt5_extra: add cmake_extra_sanity to inherit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- classes/cmake_qt5_extra.bbclass | 2 +- classes/kde-base.bbclass | 2 +- classes/liri.bbclass | 2 +- classes/lxqt.bbclass | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/classes/cmake_qt5_extra.bbclass b/classes/cmake_qt5_extra.bbclass index 29c1854a..b902fc71 100644 --- a/classes/cmake_qt5_extra.bbclass +++ b/classes/cmake_qt5_extra.bbclass @@ -1,4 +1,4 @@ -inherit cmake_qt5 +inherit cmake_qt5 cmake_extra_sanity EXTRA_OECMAKE += " \ -DCMAKE_QT5_EX_PATH_HOST_HEADERS=${STAGING_INCDIR} \ diff --git a/classes/kde-base.bbclass b/classes/kde-base.bbclass index d4c69405..ad78f76d 100644 --- a/classes/kde-base.bbclass +++ b/classes/kde-base.bbclass @@ -17,7 +17,7 @@ ${KDE_MIRROR} http://kde.c3sl.ufpr.br \n \ SRC_URI = "${KDE_MIRROR}/stable/${BPN}/${PV}/src/${BPN}-${PV}.tar.xz" # extra-cmake-modules cause dependent to check for python -inherit cmake_qt5_extra cmake_extra_sanity pythonnative +inherit cmake_qt5_extra pythonnative do_compile_prepend() { export XDG_DATA_HOME=${STAGING_DATADIR} diff --git a/classes/liri.bbclass b/classes/liri.bbclass index 76440bba..51946f82 100644 --- a/classes/liri.bbclass +++ b/classes/liri.bbclass @@ -4,7 +4,7 @@ SRC_URI = "git://github.com/lirios/${@'${BPN}'.replace('liri-', '')}.git;protoco DEPENDS += "qtbase qtdeclarative extra-cmake-modules-native" -inherit cmake_qt5 cmake_extra_sanity pkgconfig +inherit cmake_qt5_extra pkgconfig EXTRA_OECMAKE += " \ -DQML_INSTALL_DIR=${OE_QMAKE_PATH_QML} \ diff --git a/classes/lxqt.bbclass b/classes/lxqt.bbclass index 1189c1e4..d96871e4 100644 --- a/classes/lxqt.bbclass +++ b/classes/lxqt.bbclass @@ -1,4 +1,4 @@ -inherit cmake_qt5_extra cmake_extra_sanity +inherit cmake_qt5_extra HOMEPAGE = "http://lxqt.org/"