From 87adfe77783791a6ae60d7b00e954b2164595b04 Mon Sep 17 00:00:00 2001 From: Chris Cannam Date: Thu, 6 Jan 2022 11:40:37 +0000 Subject: [PATCH] Don't use source_root(), it (is deprecated because it) fails to work in wrap subproject context where it provides the parent root --- meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 474a2e1..bc46ab4 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.source_root() / 'ladspa/ladspa-plugin.list' + '-exported_symbols_list', meson.project_source_root() / 'ladspa/ladspa-plugin.list' ] vamp_symbol_args += [ - '-exported_symbols_list', meson.source_root() / 'vamp/vamp-plugin.list' + '-exported_symbols_list', meson.project_source_root() / '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.source_root() / 'ladspa/ladspa-plugin.map' + '-Wl,--version-script=' + meson.project_source_root() / 'ladspa/ladspa-plugin.map' ] vamp_symbol_args += [ - '-Wl,--version-script=' + meson.source_root() / 'vamp/vamp-plugin.map' + '-Wl,--version-script=' + meson.project_source_root() / 'vamp/vamp-plugin.map' ] endif # system