summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2018-09-04 21:52:41 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2018-09-04 21:52:41 +0530
commit9e17dfb5b1b4e1eb56c60e2496988a05676783cc (patch)
tree81c7eebe7e95113664704cebfe6a1385c6f275f7
parent172d0a4f107d0280f5ea7fd76d5bc3987f2be948 (diff)
downloadmeson-nirbheek/fix-another-fallback-vercmp-bug.tar.gz
Reference-manual: Clarify fallback dependency types [skip ci]nirbheek/fix-another-fallback-vercmp-bug
-rw-r--r--docs/markdown/Reference-manual.md7
1 files changed, 5 insertions, 2 deletions
diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md
index ea11f6001..1fac42d80 100644
--- a/docs/markdown/Reference-manual.md
+++ b/docs/markdown/Reference-manual.md
@@ -361,8 +361,11 @@ otherwise. This function supports the following keyword arguments:
dependency is not found in the system. The value is an array
`['subproj_name', 'subproj_dep']` where the first value is the name
of the subproject and the second is the variable name in that
- subproject that contains the value of
- [`declare_dependency`](#declare_dependency).
+ subproject that contains a dependency object such as the return
+ value of [`declare_dependency`](#declare_dependency) or
+ [`dependency()`](#dependency), etc. Note that this means the
+ fallback dependency may be a not-found dependency, in which
+ case the value of the `required:` kwarg will be obeyed.
- `language` *(added 0.42.0)* defines what language-specific
dependency to find if it's available for multiple languages.
- `method` defines the way the dependency is detected, the default is