From 4683cb9115215f6ec060bf9a37beb8bf9e02b0b6 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Wed, 16 Mar 2022 09:03:48 +0900 Subject: [PATCH] meson: obsolete usage of deprecated meson.build_dir() Meson build v0.56 deprecates meson.build_root(). This commit adds alternative variable for the path to built stuffs. Signed-off-by: Takashi Sakamoto --- meson.build | 2 +- src/ctl/meson.build | 3 +++ src/hwdep/meson.build | 3 +++ src/meson.build | 2 ++ src/rawmidi/meson.build | 3 +++ src/seq/meson.build | 3 +++ src/timer/meson.build | 3 +++ tests/meson.build | 4 ++-- 8 files changed, 20 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 27fc45a..db6316f 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project('alsa-gobject', 'c', version: '0.2.2', license: 'LGPL-3', - meson_version: '>= 0.47.0', + meson_version: '>= 0.48.0', ) gnome = import('gnome') diff --git a/src/ctl/meson.build b/src/ctl/meson.build index 4a7606f..5bafe57 100644 --- a/src/ctl/meson.build +++ b/src/ctl/meson.build @@ -30,6 +30,9 @@ privates = files( 'privates.h', ) +# For test. +build_dirs += {'alsactl': meson.current_build_dir()} + # # Common part except for identifier of dependency. # diff --git a/src/hwdep/meson.build b/src/hwdep/meson.build index 582b1a2..38aa2d0 100644 --- a/src/hwdep/meson.build +++ b/src/hwdep/meson.build @@ -22,6 +22,9 @@ privates = files( 'privates.h', ) +# For test. +build_dirs += {'alsahwdep': meson.current_build_dir()} + # # Common part except for identifier of dependency. # diff --git a/src/meson.build b/src/meson.build index 923de85..ae1e7a0 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,3 +1,5 @@ +build_dirs = {} + subdir('ctl') subdir('timer') subdir('seq') diff --git a/src/rawmidi/meson.build b/src/rawmidi/meson.build index 878b6b2..3d45f7f 100644 --- a/src/rawmidi/meson.build +++ b/src/rawmidi/meson.build @@ -28,6 +28,9 @@ privates = files( 'privates.h', ) +# For test. +build_dirs += {'alsarawmidi': meson.current_build_dir()} + # # Common part except for identifier of dependency. # diff --git a/src/seq/meson.build b/src/seq/meson.build index e0777a7..0407f6c 100644 --- a/src/seq/meson.build +++ b/src/seq/meson.build @@ -60,6 +60,9 @@ privates = files( 'privates.h', ) +# For test. +build_dirs += {'alsaseq': meson.current_build_dir()} + # # Common part except for identifier of dependency. # diff --git a/src/timer/meson.build b/src/timer/meson.build index 984bf19..7de7b24 100644 --- a/src/timer/meson.build +++ b/src/timer/meson.build @@ -42,6 +42,9 @@ privates = files( 'privates.h', ) +# For test. +build_dirs += {'alsatimer': meson.current_build_dir()} + # # Common part except for identifier of dependency. # diff --git a/tests/meson.build b/tests/meson.build index 89b1baf..d667395 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -47,8 +47,8 @@ tests = { } dir_paths = [] -foreach path, scripts: tests - dir_paths += join_paths(meson.build_root(), 'src', path) +foreach name, build_dir: build_dirs + dir_paths += join_paths(build_dir) endforeach env = environment() -- 2.47.3