From 71804e56eb3612eabc51887fe4d46961684a3ecc Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Mon, 13 Apr 2020 18:12:43 -0400 Subject: wrap: Add special 'dependency_names' key in [provide] section The value for that key must be a coma separated list of dependecy names provided by that subproject, when no variable name is needed because the subproject uses override_dependency(). --- test cases/common/102 subproject subdir/meson.build | 2 +- test cases/common/102 subproject subdir/subprojects/sub_implicit.wrap | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'test cases/common') diff --git a/test cases/common/102 subproject subdir/meson.build b/test cases/common/102 subproject subdir/meson.build index bc202a3..6faff75 100644 --- a/test cases/common/102 subproject subdir/meson.build +++ b/test cases/common/102 subproject subdir/meson.build @@ -31,7 +31,7 @@ d = dependency('sub_implicit') assert(d.found(), 'Should implicitly fallback') # Verify that implicit fallback works because sub_implicit.wrap has -# `sub_implicit_provide1=` and the subproject overrides sub_implicit_provide1. +# `dependency_names=sub_implicit_provide1` and the subproject overrides sub_implicit_provide1. d = dependency('sub_implicit_provide1') assert(d.found(), 'Should implicitly fallback') diff --git a/test cases/common/102 subproject subdir/subprojects/sub_implicit.wrap b/test cases/common/102 subproject subdir/subprojects/sub_implicit.wrap index c14fff0..e668a8d 100644 --- a/test cases/common/102 subproject subdir/subprojects/sub_implicit.wrap +++ b/test cases/common/102 subproject subdir/subprojects/sub_implicit.wrap @@ -1,5 +1,5 @@ [wrap-file] [provide] -sub_implicit_provide1= -sub_implicit_provide2=sub_implicit_provide2_dep +dependency_names = sub_implicit_provide1 +sub_implicit_provide2 = sub_implicit_provide2_dep -- cgit v1.1