mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

treewide: meson.build: get PIPEWIRE_{CONFIG,MODULE}_DIR from dependency

Browse source 
Instead of hard-coding the paths relative to the project root,
retrieve the correct paths from `pipewire_dep`.
This commit is contained in:
Barnabás Pőcze 2021-12-28 17:14:10 +01:00
parent 26eb66fb5b
commit 93b4fc59cf
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
meson.build
View file

@ -508,8 +508,8 @@ if meson.version().version_compare('>=0.58.0')
builddir = meson.project_build_root() builddir = meson.project_build_root()
srcdir = meson.project_source_root() srcdir = meson.project_source_root()
devenv.set('PIPEWIRE_CONFIG_DIR', builddir / 'src' / 'daemon') devenv.set('PIPEWIRE_CONFIG_DIR', pipewire_dep.get_variable(internal: 'confdatadir'))
devenv.set('PIPEWIRE_MODULE_DIR', builddir / 'src' / 'modules') devenv.set('PIPEWIRE_MODULE_DIR', pipewire_dep.get_variable(internal: 'moduledir'))
devenv.set('SPA_PLUGIN_DIR', spa_dep.get_variable(internal: 'plugindir')) devenv.set('SPA_PLUGIN_DIR', spa_dep.get_variable(internal: 'plugindir'))
devenv.set('SPA_DATA_DIR', srcdir / 'spa' / 'plugins') devenv.set('SPA_DATA_DIR', srcdir / 'spa' / 'plugins')

4
src/modules/meson.build
View file

@ -380,8 +380,8 @@ test('pw-test-protocol-native',
), ),
env : [ env : [
'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')), 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.project_build_root()), 'PIPEWIRE_CONFIG_DIR=@0@'.format(pipewire_dep.get_variable(internal: 'confdatadir')),
'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.project_build_root()) 'PIPEWIRE_MODULE_DIR=@0@'.format(pipewire_dep.get_variable(internal: 'moduledir')),
] ]
) )

4
src/tests/meson.build
View file

@ -14,8 +14,8 @@ foreach a : test_apps
install_dir : installed_tests_execdir), install_dir : installed_tests_execdir),
env : [ env : [
'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')), 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')),
'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.project_build_root()), 'PIPEWIRE_CONFIG_DIR=@0@'.format(pipewire_dep.get_variable(internal: 'confdatadir')),
'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.project_build_root()) 'PIPEWIRE_MODULE_DIR=@0@'.format(pipewire_dep.get_variable(internal: 'moduledir')),
]) ])
if installed_tests_enabled if installed_tests_enabled