mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-05 06:58:49 +00:00
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: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2976>
This commit is contained in:
parent
57a6e48ed1
commit
ef6f157205
1 changed files with 3 additions and 2 deletions
|
@ -174,12 +174,13 @@ foreach sp : subprojects
|
||||||
|
|
||||||
if subproj.found()
|
if subproj.found()
|
||||||
plugins = subproj.get_variable('gst_plugins', [])
|
plugins = subproj.get_variable('gst_plugins', [])
|
||||||
|
legacy_plugins = subproj.get_variable('plugins', [])
|
||||||
all_plugins += 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(f'DEPRECATED use of the `plugins` variable in @project_name@.')
|
||||||
warning('The variable should now be called `gst_plugins` and use:')
|
warning('The variable should now be called `gst_plugins` and use:')
|
||||||
warning('`declare_dependency( link_with: <plugin_target>, variable: {\'full_path\': <plugin_target>.full_path()})` instead')
|
warning('`declare_dependency( link_with: <plugin_target>, variable: {\'full_path\': <plugin_target>.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()})]
|
all_plugins += [declare_dependency(link_with: plugin, variables: {'full_path': plugin.full_path()})]
|
||||||
endforeach
|
endforeach
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in a new issue