system/pipewire
system/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire synced 2024-10-02 22:25:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: meson.build: get SPA_PLUGIN_DIR from dependency

Browse source 
Instead of hard-coding the path relative to the project root,
retrieve the correct path from `spa_dep`.
This commit is contained in:
Barnabás Pőcze 2021-12-28 17:08:11 +01:00
parent 8ed46a283f
commit 26eb66fb5b
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -511,7 +511,7 @@ if meson.version().version_compare('>=0.58.0')
devenv.set('PIPEWIRE_CONFIG_DIR', builddir / 'src' / 'daemon')
devenv.set('PIPEWIRE_MODULE_DIR', builddir / 'src' / 'modules')
devenv.set('SPA_PLUGIN_DIR', builddir / 'spa' / 'plugins')
devenv.set('SPA_PLUGIN_DIR', spa_dep.get_variable(internal: 'plugindir'))
devenv.set('SPA_DATA_DIR', srcdir / 'spa' / 'plugins')
devenv.set('GST_PLUGIN_PATH', builddir / 'src'/ 'gst')

4
spa/plugins/audioconvert/meson.build
View file

@ -140,7 +140,7 @@ foreach a : test_apps
install : installed_tests_enabled,
install_dir : installed_tests_execdir / 'audioconvert'),
env : [
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.project_build_root()),
'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
])
if installed_tests_enabled
@ -170,7 +170,7 @@ foreach a : benchmark_apps
install : installed_tests_enabled,
install_dir : installed_tests_execdir / 'audioconvert'),
env : [
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.project_build_root()),
'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
])
if installed_tests_enabled

2
spa/tests/meson.build
View file

@ -40,7 +40,7 @@ foreach a : benchmark_apps
install_dir : installed_tests_execdir,
),
env : [
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.project_build_root()),
'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
]
)

2
src/modules/meson.build
View file

@ -379,7 +379,7 @@ test('pw-test-protocol-native',
install_dir : installed_tests_execdir,
),
env : [
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.project_build_root()),
'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.project_build_root()),
'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.project_build_root())
]

2
src/tests/meson.build
View file

@ -13,7 +13,7 @@ foreach a : test_apps
install : installed_tests_enabled,
install_dir : installed_tests_execdir),
env : [
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.project_build_root()),
'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.project_build_root()),
'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.project_build_root())
])