fdo-mirrors/wireplumber
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/wireplumber.git synced 2025-12-20 04:10:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson.build: remove version check before setting up devenv

Browse source 
Since 2eed279c9d wireplumber requires at least meson 0.59.0,
and the devenv feature is available since 0.58.0, the version check
before adding the devenv is no longer needed. Remove it.
This commit is contained in:
Barnabás Pőcze 2022-07-22 21:01:48 +02:00
parent d5029697de
commit d7c8bd29d4
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
meson.build
View file

@ -129,10 +129,13 @@ if get_option('tests')
subdir('tests')
endif
builddir = meson.project_build_root()
srcdir = meson.project_source_root()
conf_uninstalled = configuration_data()
conf_uninstalled.set('MESON', '')
conf_uninstalled.set('MESON_SOURCE_ROOT', meson.project_source_root())
conf_uninstalled.set('MESON_BUILD_ROOT', meson.project_build_root())
conf_uninstalled.set('MESON_SOURCE_ROOT', srcdir)
conf_uninstalled.set('MESON_BUILD_ROOT', builddir)
wp_uninstalled = configure_file(
input : 'wp-uninstalled.sh',
@ -147,15 +150,10 @@ wireplumber_uninstalled = custom_target('wp-uninstalled',
command : ['cp', '@INPUT@', '@OUTPUT@'],
)
if meson.version().version_compare('>= 0.58')
builddir = meson.project_build_root()
srcdir = meson.project_source_root()
devenv = environment({
'WIREPLUMBER_MODULE_DIR': builddir / 'modules',
'WIREPLUMBER_CONFIG_DIR': srcdir / 'src' / 'config',
'WIREPLUMBER_DATA_DIR': srcdir / 'src',
})
devenv = environment({
'WIREPLUMBER_MODULE_DIR': builddir / 'modules',
'WIREPLUMBER_CONFIG_DIR': srcdir / 'src' / 'config',
'WIREPLUMBER_DATA_DIR': srcdir / 'src',
})
meson.add_devenv(devenv)
endif
meson.add_devenv(devenv)