From 2ddbc650dd89a119d6c30eebf021c507d3e05ce2 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Wed, 10 Jun 2020 06:41:20 +0900 Subject: [PATCH] seq: scan ALSATimer-0.0 gir by g-ir-scanner for dependency Signed-off-by: Takashi Sakamoto --- src/seq/meson.build | 1 + src/timer/meson.build | 2 +- tests/meson.build | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/seq/meson.build b/src/seq/meson.build index 57927ad..63b4e4f 100644 --- a/src/seq/meson.build +++ b/src/seq/meson.build @@ -144,6 +144,7 @@ gnome.generate_gir(library, includes: [ 'GLib-2.0', 'GObject-2.0', + alsatimer_gir[0], ], install: true, ) diff --git a/src/timer/meson.build b/src/timer/meson.build index 489201e..3003950 100644 --- a/src/timer/meson.build +++ b/src/timer/meson.build @@ -114,7 +114,7 @@ pkg.generate(library, ) # Generate metadata for gobject introspection. -gnome.generate_gir(library, +alsatimer_gir = gnome.generate_gir(library, sources: sources + headers, nsversion: '0.0', namespace: namespace, diff --git a/tests/meson.build b/tests/meson.build index 1a74b73..321ca71 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -56,13 +56,16 @@ tests = { ], } +dir_paths = [] foreach path, scripts: tests - objdir = join_paths(meson.build_root(), 'src', path) + dir_paths += join_paths(meson.build_root(), 'src', path) +endforeach - env = environment() - env.append('LD_LIBRARY_PATH', objdir, separator : ':') - env.append('GI_TYPELIB_PATH', objdir, separator : ':') +env = environment() +env.append('LD_LIBRARY_PATH', ':'.join(dir_paths), separator : ':') +env.append('GI_TYPELIB_PATH', ':'.join(dir_paths), separator : ':') +foreach path, scripts: tests foreach script: scripts prog = find_program(script) test(script, prog, -- 2.47.3