diff options
author | Pascal Bach <pascal.bach@siemens.com> | 2016-05-11 15:53:45 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-06-07 20:10:21 +0200 |
commit | aacd63f10dd58acf7bf6138e2f4734e37dcf0420 (patch) | |
tree | 42eb439625aa01d4b98638857927b482693b8bea | |
parent | 48b4084675a15fe3fd10b58f54728dfaa2bd6c72 (diff) | |
download | meta-qt5-aacd63f10dd58acf7bf6138e2f4734e37dcf0420.tar.gz |
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.bbclass | 2 |
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 | |||
3 | 3 | ||
4 | DEPENDS_prepend = "qtbase " | 4 | DEPENDS_prepend = "qtbase " |
5 | 5 | ||
6 | EXTRA_OECMAKE += " \ | 6 | EXTRA_OECMAKE_prepend = " \ |
7 | -DOE_QMAKE_PATH_PREFIX=${OE_QMAKE_PATH_PREFIX} \ | 7 | -DOE_QMAKE_PATH_PREFIX=${OE_QMAKE_PATH_PREFIX} \ |
8 | -DOE_QMAKE_PATH_HEADERS=${OE_QMAKE_PATH_HEADERS} \ | 8 | -DOE_QMAKE_PATH_HEADERS=${OE_QMAKE_PATH_HEADERS} \ |
9 | -DOE_QMAKE_PATH_LIBS=${OE_QMAKE_PATH_LIBS} \ | 9 | -DOE_QMAKE_PATH_LIBS=${OE_QMAKE_PATH_LIBS} \ |