aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Bach <pascal.bach@siemens.com>2016-05-11 15:53:45 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2016-06-07 20:10:21 +0200
commitaacd63f10dd58acf7bf6138e2f4734e37dcf0420 (patch)
tree42eb439625aa01d4b98638857927b482693b8bea
parent48b4084675a15fe3fd10b58f54728dfaa2bd6c72 (diff)
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 <pascal.bach@siemens.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--classes/cmake_qt5.bbclass2
1 files changed, 1 insertions, 1 deletions
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} \