From bcf369ea3c6ac9d48759a9a11304a853dfdab5ff Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Thu, 15 Oct 2020 09:56:08 -0400 Subject: Fix consistency in variables kwarg Share common code to extract the `variables` kwarg in declare_dependency() and pkg.generate(). --- test cases/common/218 dependency get_variable method/meson.build | 3 +++ test cases/common/47 pkgconfig-gen/meson.build | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'test cases/common') diff --git a/test cases/common/218 dependency get_variable method/meson.build b/test cases/common/218 dependency get_variable method/meson.build index 8c189bb..9f60836 100644 --- a/test cases/common/218 dependency get_variable method/meson.build +++ b/test cases/common/218 dependency get_variable method/meson.build @@ -59,3 +59,6 @@ idep = declare_dependency() assert(idep.get_variable(pkgconfig : 'foo', cmake : 'foo', configtool : 'foo', default_value : default) == default, 'something went wrong with an InternalDependency with no variables.') + +idep = declare_dependency(variables : ['foo=value']) +assert(idep.get_variable(internal: 'foo') == 'value') diff --git a/test cases/common/47 pkgconfig-gen/meson.build b/test cases/common/47 pkgconfig-gen/meson.build index 8c16cd5..4638123 100644 --- a/test cases/common/47 pkgconfig-gen/meson.build +++ b/test cases/common/47 pkgconfig-gen/meson.build @@ -64,7 +64,8 @@ pkgg.generate( name : 'libhello_nolib', description : 'A minimalistic pkgconfig file.', version : libver, - dataonly: true + dataonly: true, + variables : {'foo': 'bar'}, ) # Regression test for 2 cases: -- cgit v1.1