From 0717c65abc24d67887c93b773129156f714d033b Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 11 May 2016 15:53:45 +0200 Subject: cmake_qt5: prepend the Qt5 specific CMake variables to EXTRA_OECMAKE Using the prepend function instead of "=+" makes sure the variables are set even if the user overrides EXTRA_OECMAKE with "=" instead of just appending to it. Prepending also allows overriding because later arguments take precedence ever earlier ones in CMake. Signed-off-by: Pascal Bach Signed-off-by: Martin Jansa --- classes/cmake_qt5.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/cmake_qt5.bbclass b/classes/cmake_qt5.bbclass index 813ea0c9..4dc897bb 100644 --- a/classes/cmake_qt5.bbclass +++ b/classes/cmake_qt5.bbclass @@ -3,7 +3,7 @@ inherit qmake5_paths DEPENDS_prepend = "qtbase " -EXTRA_OECMAKE += " \ +EXTRA_OECMAKE_prepend = " \ -DOE_QMAKE_PATH_PREFIX=${OE_QMAKE_PATH_PREFIX} \ -DOE_QMAKE_PATH_HEADERS=${OE_QMAKE_PATH_HEADERS} \ -DOE_QMAKE_PATH_LIBS=${OE_QMAKE_PATH_LIBS} \ -- cgit v1.2.3-54-g00ecf