aboutsummaryrefslogtreecommitdiff
path: root/docs/markdown/Wrap-dependency-system-manual.md
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2020-10-12 17:50:14 +0300
committerGitHub <noreply@github.com>2020-10-12 17:50:14 +0300
commitaae23dfff3aa8269a07b6d42479a00923bf73c6e (patch)
tree6ab489fab1e889141ac3560af38c3da477628b7b /docs/markdown/Wrap-dependency-system-manual.md
parentba71fde18652ca156a35cd576dd9981202088424 (diff)
parent726b82205492a9e1f2dfd0fba96b237b51eeb428 (diff)
downloadmeson-aae23dfff3aa8269a07b6d42479a00923bf73c6e.zip
meson-aae23dfff3aa8269a07b6d42479a00923bf73c6e.tar.gz
meson-aae23dfff3aa8269a07b6d42479a00923bf73c6e.tar.bz2
Merge pull request #7740 from bonzini/fallback-false
Allow blocking/forcing automatic subproject search
Diffstat (limited to 'docs/markdown/Wrap-dependency-system-manual.md')
-rw-r--r--docs/markdown/Wrap-dependency-system-manual.md10
1 files changed, 6 insertions, 4 deletions
diff --git a/docs/markdown/Wrap-dependency-system-manual.md b/docs/markdown/Wrap-dependency-system-manual.md
index 8e6282e..4189709 100644
--- a/docs/markdown/Wrap-dependency-system-manual.md
+++ b/docs/markdown/Wrap-dependency-system-manual.md
@@ -182,10 +182,12 @@ endif
`dependency('foo-1.0', required: get_option('foo_opt'))` will only fallback
when the user sets `foo_opt` to `enabled` instead of `auto`.
-If it is desired to fallback for an optional dependency, the `fallback` keyword
-argument must be passed explicitly. For example
-`dependency('foo-1.0', required: get_option('foo_opt'), fallback: 'foo')` will
-use the fallback even when `foo_opt` is set to `auto`.
+If it is desired to fallback for an optional dependency, the `fallback`
+or `allow_fallback` keyword arguments must be passed explicitly. *Since
+0.56.0*, `dependency('foo-1.0', required: get_option('foo_opt'),
+allow_fallback: true)` will use the fallback even when `foo_opt` is set
+to `auto`. On version *0.55.0* the same effect could be achieved with
+`dependency('foo-1.0', required: get_option('foo_opt'), fallback: 'foo')`.
This mechanism assumes the subproject calls `meson.override_dependency('foo-1.0', foo_dep)`
so Meson knows which dependency object should be used as fallback. Since that