aboutsummaryrefslogtreecommitdiff
path: root/docs/markdown
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2020-07-05 14:56:58 -0400
committerJussi Pakkanen <jpakkane@gmail.com>2020-07-09 01:35:03 +0300
commitf1edb83bb6a7941a3215bf0c3025e454510946e4 (patch)
tree60d9db736d5e29da825cbdd6b0d495d259b88490 /docs/markdown
parent7ab0090d2afd8e7301d1ee5d60dd63148ffff607 (diff)
downloadmeson-f1edb83bb6a7941a3215bf0c3025e454510946e4.zip
meson-f1edb83bb6a7941a3215bf0c3025e454510946e4.tar.gz
meson-f1edb83bb6a7941a3215bf0c3025e454510946e4.tar.bz2
doc: Small tweaks to fallback documentation [skip ci]
Diffstat (limited to 'docs/markdown')
-rw-r--r--docs/markdown/Reference-manual.md2
-rw-r--r--docs/markdown/Wrap-dependency-system-manual.md6
2 files changed, 6 insertions, 2 deletions
diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md
index 9bca74b..966d408 100644
--- a/docs/markdown/Reference-manual.md
+++ b/docs/markdown/Reference-manual.md
@@ -461,6 +461,8 @@ arguments:
and subproject registered the dependency using
`meson.override_dependency('dependency_name', subproj_dep)`, or when the wrap
file has `dependency_name` in its `[provide]` section.
+ See [Wrap documentation](Wrap-dependency-system-manual.md#provide-section)
+ for more details.
- `language` *(since 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
diff --git a/docs/markdown/Wrap-dependency-system-manual.md b/docs/markdown/Wrap-dependency-system-manual.md
index 54ef811..8e6282e 100644
--- a/docs/markdown/Wrap-dependency-system-manual.md
+++ b/docs/markdown/Wrap-dependency-system-manual.md
@@ -147,7 +147,7 @@ wrap-git.
Wrap files can define the dependencies it provides in the `[provide]` section.
-```
+```ini
[provide]
dependency_names = foo-1.0
```
@@ -162,7 +162,8 @@ where `foo_opt` is a feature option set to `auto`, will not fallback to the
subproject defined in the wrap file, for 2 reasons:
- It allows for looking the dependency in other ways first, for example using
`cc.find_library('foo')`, and only fallback if that fails:
-```
+
+```meson
# this won't use fallback defined in foo.wrap
foo_dep = dependency('foo-1.0', required: false)
if not foo_dep.found()
@@ -175,6 +176,7 @@ if not foo_dep.found()
endif
endif
```
+
- Sometimes not-found dependency is preferable to a fallback when the feature is
not explicitly requested by the user. In that case
`dependency('foo-1.0', required: get_option('foo_opt'))` will only fallback