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

This commit is contained in:
Chris Cannam
2022-01-06 11:49:42 +00:00
parent 87adfe7778
commit 8ccbe0df98

View File

@@ -326,10 +326,10 @@ endif
if system == 'darwin' if system == 'darwin'
feature_defines += ['-DUSE_PTHREADS', '-DMALLOC_IS_ALIGNED'] feature_defines += ['-DUSE_PTHREADS', '-DMALLOC_IS_ALIGNED']
ladspa_symbol_args += [ 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 += [ 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' if architecture == 'aarch64'
@@ -379,10 +379,10 @@ elif system == 'windows'
else # system not darwin or windows else # system not darwin or windows
feature_defines += ['-DUSE_PTHREADS', '-DHAVE_POSIX_MEMALIGN'] feature_defines += ['-DUSE_PTHREADS', '-DHAVE_POSIX_MEMALIGN']
ladspa_symbol_args += [ 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 += [ 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 endif # system