From d5ca33f6c7b0cd1ca20ec5dc7131aeedf1503080 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Wed, 3 Apr 2019 17:03:45 +0700 Subject: qcam: meson: Use pkg-config method for qt5 dependencies Meson searches for qmake to determine if QT5 is available to support the optional qcam component. When cross compiling, meson can incorrectly identify the host qmake which will cause incorrect linkage and usage of system headers. Set the dependency method to specify pkg-config which resolves the issue. Reviewed-by: Laurent Pinchart Signed-off-by: Kieran Bingham --- src/qcam/meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/qcam/meson.build b/src/qcam/meson.build index 8a71cda3..3d8b1b3b 100644 --- a/src/qcam/meson.build +++ b/src/qcam/meson.build @@ -8,7 +8,10 @@ qcam_sources = files([ ]) import('qt5') -qt5_dep = dependency('qt5', modules: ['Core', 'Gui', 'Widgets'], required : false) +qt5_dep = dependency('qt5', + method : 'pkg-config', + modules : ['Core', 'Gui', 'Widgets'], + required : false) if qt5_dep.found() qcam = executable('qcam', qcam_sources, -- cgit v1.2.1