aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoergen Ibsen <ji@ibse.dk>2017-11-13 09:55:36 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2017-11-13 22:55:45 +0200
commit6d85e10df921c0399adfc01507a76f04c684245c (patch)
tree5d06bc092beb136f53ed6c896b86127ae1eb39f6
parent49eb33ff5563e68bc89b399935923b892a99b54f (diff)
downloadmeson-6d85e10df921c0399adfc01507a76f04c684245c.zip
meson-6d85e10df921c0399adfc01507a76f04c684245c.tar.gz
meson-6d85e10df921c0399adfc01507a76f04c684245c.tar.bz2
docs: fix description of default_options
For dependency() and subproject(), the default_options argument can override the defaults in the subproject's meson_options.txt, not in its project() invocation. Resolves #2612
-rw-r--r--docs/markdown/Reference-manual.md14
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md
index 92c8a1f..2aa9665 100644
--- a/docs/markdown/Reference-manual.md
+++ b/docs/markdown/Reference-manual.md
@@ -282,8 +282,8 @@ system) with the given name with `pkg-config` if possible and with
[library-specific fallback detection logic](Dependencies.md)
otherwise. This function supports the following keyword arguments:
-- `default_options` *(added 0.37.0)* an array of option values that
- override those set in the project's `default_options` invocation
+- `default_options` *(added 0.37.0)* an array of default option values
+ that override those set in the subproject's `meson_options.txt`
(like `default_options` in [`project()`](#project), they only have
effect when Meson is run for the first time, and command line
arguments override any default options in build files)
@@ -1046,11 +1046,11 @@ example a subproject called `foo` must be located in
`${MESON_SOURCE_ROOT}/subprojects/foo`. Supports the following keyword
arguments:
- - `default_options`, *(added 0.37.0)* an array of default option
- values that override those set in the project's `default_options`
- invocation (like `default_options` in `project`, they only have
- effect when Meson is run for the first time, and command line
- arguments override any default options in build files)
+ - `default_options` *(added 0.37.0)* an array of default option values
+ that override those set in the subproject's `meson_options.txt`
+ (like `default_options` in `project`, they only have effect when
+ Meson is run for the first time, and command line arguments override
+ any default options in build files)
- `version` keyword argument that works just like the one in
`dependency`. It specifies what version the subproject should be,
as an example `>=1.0.1`