aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2019-12-05 11:42:50 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2019-12-10 20:17:21 +0200
commitfc800a2cb8cb754e55db1b6ede287079d44dc244 (patch)
tree7c6bdfd3f92594968c7ec6b08485eb99c6e9dbda /docs
parent38d3fbca9465e4c89e479be5a98b5085a7f83039 (diff)
downloadmeson-fc800a2cb8cb754e55db1b6ede287079d44dc244.zip
meson-fc800a2cb8cb754e55db1b6ede287079d44dc244.tar.gz
meson-fc800a2cb8cb754e55db1b6ede287079d44dc244.tar.bz2
mintro: Add version key to --scan-dependencies (fixes #6287)
Diffstat (limited to 'docs')
-rw-r--r--docs/markdown/IDE-integration.md6
-rw-r--r--docs/markdown/snippets/introspect.md3
2 files changed, 8 insertions, 1 deletions
diff --git a/docs/markdown/IDE-integration.md b/docs/markdown/IDE-integration.md
index 88043d3..1c66d53 100644
--- a/docs/markdown/IDE-integration.md
+++ b/docs/markdown/IDE-integration.md
@@ -207,6 +207,7 @@ The output format is as follows:
{
"name": "The name of the dependency",
"required": true,
+ "version": [">=1.2.3"],
"conditional": false,
"has_fallback": false
}
@@ -219,7 +220,10 @@ in the `meson.build` (all dependencies are required by default). The
inside a conditional block. In a real meson run these dependencies might not be
used, thus they _may_ not be required, even if the `required` key is set. The
`has_fallback` key just indicates whether a fallback was directly set in the
-`dependency()` function.
+`dependency()` function. The `version` key always contains a list of version
+requirements from the `meson.build` and **not** the actual version of the
+dependency on disc. The version list is empty if no version was specified
+in the `meson.build`.
## Tests
diff --git a/docs/markdown/snippets/introspect.md b/docs/markdown/snippets/introspect.md
index 4d9fab2..097fd17 100644
--- a/docs/markdown/snippets/introspect.md
+++ b/docs/markdown/snippets/introspect.md
@@ -2,3 +2,6 @@
dependencies (--dependencies, intro-dependencies.json):
- added the `version` key
+
+scanning dependencies (--scan-dependencies):
+- added the `version` key containing the required dependency version