From 56cceb103dc633d6af957472945e792187a5dd4e Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 11 Sep 2021 01:28:39 -0400 Subject: Update zix and make it a proper subproject --- meson.build | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index da14eb27..7d1d3c84 100644 --- a/meson.build +++ b/meson.build @@ -118,9 +118,6 @@ sources = [ 'src/uri.c', 'src/world.c', 'src/writer.c', - 'src/zix/btree.c', - 'src/zix/digest.c', - 'src/zix/hash.c', ] # System libraries @@ -170,6 +167,10 @@ library_args += ['-DSERD_MAJOR_VERSION=@0@'.format(serd_major_version), '-DSERD_MINOR_VERSION=@0@'.format(serd_minor_version), '-DSERD_MICRO_VERSION=@0@'.format(serd_micro_version)] +zix_dep = dependency('zix-0', + version: '>= 0.0.1', + fallback: ['zix', 'zix_dep']) + exess_dep = dependency('exess-0', version: '>= 0.0.1', fallback: ['exess', 'exess_dep']) @@ -181,7 +182,7 @@ libserd = build_target( version: meson.project_version(), include_directories: include_directories('include', 'src'), c_args: c_warnings + platform_args + library_args, - dependencies: [exess_dep, m_dep], + dependencies: [exess_dep, m_dep, zix_dep], gnu_symbol_visibility: 'hidden', install: true, target_type: library_type) -- cgit v1.2.1