From 7b491f382cf61f48b4e963953af492f80267dfec Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Thu, 12 Oct 2023 00:27:11 +1100 Subject: [PATCH] build/qt6: properly error/skip build if the qsb tool is not found Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3032 Part-of: --- subprojects/gst-plugins-good/ext/qt6/meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/subprojects/gst-plugins-good/ext/qt6/meson.build b/subprojects/gst-plugins-good/ext/qt6/meson.build index 71344e65e9..152062254c 100644 --- a/subprojects/gst-plugins-good/ext/qt6/meson.build +++ b/subprojects/gst-plugins-good/ext/qt6/meson.build @@ -60,6 +60,11 @@ if not qt6qml_dep.found() subdir_done() endif +qsb = find_program('qsb-qt6', 'qsb', required: qt6_option) +if not qsb.found() + subdir_done() +endif + optional_deps = [] qt_defines = [] have_qpa_include = false @@ -159,7 +164,6 @@ if qt6_option.require(have_qt_windowing).allowed() # Build it! moc_files = qt6_mod.preprocess(moc_headers : moc_headers, method: qt6_method) # TODO: dist backup qsb shaders? - qsb = find_program('qsb-qt6', 'qsb') shaders = [] foreach shader: shader_sources qsb_shader = shader + '.qsb'