From 8ccbe0df9848945b60bcad220fb0d86734afb056 Mon Sep 17 00:00:00 2001 From: Chris Cannam Date: Thu, 6 Jan 2022 11:49:42 +0000 Subject: [PATCH] Ah, project_source_root() was only added in Meson 0.56 and I really don't want to advance beyond 0.53 for the moment because that's what is in current Ubuntu LTS. It looks as if current_source_dir() works for our purposes in main project and subproject contexts, so use that --- meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index bc46ab4..f7611eb 100644 --- a/meson.build +++ b/meson.build @@ -326,10 +326,10 @@ endif if system == 'darwin' feature_defines += ['-DUSE_PTHREADS', '-DMALLOC_IS_ALIGNED'] ladspa_symbol_args += [ - '-exported_symbols_list', meson.project_source_root() / 'ladspa/ladspa-plugin.list' + '-exported_symbols_list', meson.current_source_dir() / 'ladspa/ladspa-plugin.list' ] vamp_symbol_args += [ - '-exported_symbols_list', meson.project_source_root() / 'vamp/vamp-plugin.list' + '-exported_symbols_list', meson.current_source_dir() / 'vamp/vamp-plugin.list' ] if architecture == 'aarch64' @@ -379,10 +379,10 @@ elif system == 'windows' else # system not darwin or windows feature_defines += ['-DUSE_PTHREADS', '-DHAVE_POSIX_MEMALIGN'] ladspa_symbol_args += [ - '-Wl,--version-script=' + meson.project_source_root() / 'ladspa/ladspa-plugin.map' + '-Wl,--version-script=' + meson.current_source_dir() / 'ladspa/ladspa-plugin.map' ] vamp_symbol_args += [ - '-Wl,--version-script=' + meson.project_source_root() / 'vamp/vamp-plugin.map' + '-Wl,--version-script=' + meson.current_source_dir() / 'vamp/vamp-plugin.map' ] endif # system