Patchwork [meta-qt5,2/3] cmake_qt5.bbclass: Use qmake_qt5_base.bbclass

login
register
mail settings
Submitter Otavio Salvador
Date June 9, 2014, 12:34 p.m.
Message ID <1402317295-5120-2-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/73491/
State New, archived
Headers show

Comments

Otavio Salvador - June 9, 2014, 12:34 p.m.
The CMake uses QMake internally to query system settings so we ought
to have it using the same variable contents and settings.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 classes/cmake_qt5.bbclass | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Patch

diff --git a/classes/cmake_qt5.bbclass b/classes/cmake_qt5.bbclass
index 94a60dc..aaead5d 100644
--- a/classes/cmake_qt5.bbclass
+++ b/classes/cmake_qt5.bbclass
@@ -1,5 +1,12 @@ 
+#
+# QMake variables for Qt
+#
+inherit qmake5_base
+
+QT5TOOLSDEPENDS ?= "qtbase-native"
+DEPENDS_prepend = "${QT5TOOLSDEPENDS} "
+
 inherit cmake
-inherit qmake5_paths
 
 EXTRA_OECMAKE += " \
     -DOE_QMAKE_PATH_PREFIX=${OE_QMAKE_PATH_PREFIX} \