From ef6f157205ab47a80ac316ed220b5ce15f2ef4ac Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 2 Sep 2022 10:46:45 -0400 Subject: [PATCH] meson: Subprjects can define both "plugins" and "gst_plugins" If "gst_plugins" is defined we can ignore the value of legacy "plugins" variable, subprojects could be using it for something else, which is the case of gst-plugin-rs. Part-of: --- meson.build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index ae1141645e..69f7d9bf46 100644 --- a/meson.build +++ b/meson.build @@ -174,12 +174,13 @@ foreach sp : subprojects if subproj.found() plugins = subproj.get_variable('gst_plugins', []) + legacy_plugins = subproj.get_variable('plugins', []) all_plugins += plugins - if subproj.get_variable('gst_plugins', []).length() != subproj.get_variable('plugins', plugins).length() + if plugins.length() == 0 and legacy_plugins.length() > 0 warning(f'DEPRECATED use of the `plugins` variable in @project_name@.') warning('The variable should now be called `gst_plugins` and use:') warning('`declare_dependency( link_with: , variable: {\'full_path\': .full_path()})` instead') - foreach plugin: subproj.get_variable('plugins', []) + foreach plugin: legacy_plugins all_plugins += [declare_dependency(link_with: plugin, variables: {'full_path': plugin.full_path()})] endforeach endif