From 5bcf1f1ddd4c024cd4ac6fab28b7e06a53f33faa Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Mon, 5 Sep 2016 19:55:58 -0300 Subject: [PATCH] meson: Workaround the qt5 module not letting us now the preprocessor is not avalaible If moc-qt5 is not avalaible, meson breaks: https://github.com/mesonbuild/meson/issues/758 --- tests/examples/overlay/meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/examples/overlay/meson.build b/tests/examples/overlay/meson.build index 94d7dc057a..c86046f9fe 100644 --- a/tests/examples/overlay/meson.build +++ b/tests/examples/overlay/meson.build @@ -10,7 +10,10 @@ if x11_dep.found() # FIXME: originally if USE_X if add_languages('cpp') # check for C++ support qt5_mod = import('qt5') qt5widgets_dep = dependency('qt5', modules : ['Gui', 'Widgets'], required: false) - if qt5widgets_dep.found() + + # FIXME Add a way to get that information out of the qt5 module + moc = find_program('moc-qt5', required : false) + if qt5widgets_dep.found() and moc.found() executable('qt-videooverlay', 'qt-videooverlay.cpp', cpp_args : gst_plugins_base_args, include_directories: [configinc, libsinc],