mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-06 13:30:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

treewide: meson.build: use project_{build,source}_root()

Browse source 
Use `meson.project_{build,source}_root()` instead of
`meson.{build,source}_root()` because those functions
do not work as expected when used inside a subproject,
and they have been deprecated in meson 0.56.0.
This commit is contained in:
Barnabás Pőcze 2021-12-28 16:35:20 +01:00
parent b666edde78
commit 8ed46a283f
8 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/daemon/meson.build
View file

@ -18,9 +18,9 @@ conf_config.set('pulse_comment', '#')
conf_config_uninstalled = conf_config
conf_config_uninstalled.set('pipewire_path',
meson.build_root() / 'src' / 'daemon' / 'pipewire')
meson.project_build_root() / 'src' / 'daemon' / 'pipewire')
conf_config_uninstalled.set('pipewire_pulse_path',
meson.build_root() / 'src' / 'daemon' / 'pipewire-pulse')
meson.project_build_root() / 'src' / 'daemon' / 'pipewire-pulse')
conf_config_uninstalled.set('pulse_comment', '')
build_ms = 'media-session' in get_option('session-managers')
@ -105,7 +105,7 @@ custom_target('pipewire-uninstalled',
install: false,
input: pipewire_exec,
output: 'pipewire-uninstalled',
command: [ln, '-fs', meson.build_root() + '/@INPUT@', '@OUTPUT@'],
command: [ln, '-fs', meson.project_build_root() + '/@INPUT@', '@OUTPUT@'],
)
#desktop_file = i18n.merge_file(

6
src/modules/meson.build
View file

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

6
src/tests/meson.build
View file

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