aboutsummaryrefslogtreecommitdiff
path: root/test cases/common
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2020-04-13 18:12:43 -0400
committerXavier Claessens <xavier.claessens@collabora.com>2020-07-01 09:51:57 -0400
commit71804e56eb3612eabc51887fe4d46961684a3ecc (patch)
treeecc5fecb9e2493db6fb60feda4c1c8d317e4b07c /test cases/common
parent2a7f72885ff0623a0a625efb5ffeca6299fc4cf7 (diff)
downloadmeson-71804e56eb3612eabc51887fe4d46961684a3ecc.zip
meson-71804e56eb3612eabc51887fe4d46961684a3ecc.tar.gz
meson-71804e56eb3612eabc51887fe4d46961684a3ecc.tar.bz2
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().
Diffstat (limited to 'test cases/common')
-rw-r--r--test cases/common/102 subproject subdir/meson.build2
-rw-r--r--test cases/common/102 subproject subdir/subprojects/sub_implicit.wrap4
2 files changed, 3 insertions, 3 deletions
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