From d7c8bd29d4a310ffd467871f415baf4f5e87d7fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Fri, 22 Jul 2022 21:01:48 +0200 Subject: [PATCH] meson.build: remove version check before setting up devenv Since 2eed279c9d3f 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. --- meson.build | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/meson.build b/meson.build index d67f559f..58b5fafc 100644 --- a/meson.build +++ b/meson.build @@ -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)