diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-11-14 17:29:34 +0100 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-11-14 18:16:47 +0100 |
| commit | c361181cd9d6eeea24a1f8ad94772f4cce132692 (patch) | |
| tree | 2fd09bad0e5c0d9d976b7e5cf4acd3019569460f | |
| parent | 2e62d6a20382f3cd4c4eb60104921e18a963b533 (diff) | |
| download | meson-c361181cd9d6eeea24a1f8ad94772f4cce132692.zip meson-c361181cd9d6eeea24a1f8ad94772f4cce132692.tar.gz meson-c361181cd9d6eeea24a1f8ad94772f4cce132692.tar.bz2 | |
mintro: dependencies: added version key
| -rw-r--r-- | docs/markdown/IDE-integration.md | 4 | ||||
| -rw-r--r-- | docs/markdown/snippets/introspect.md | 4 | ||||
| -rw-r--r-- | mesonbuild/mintro.py | 1 | ||||
| -rwxr-xr-x | run_unittests.py | 1 |
4 files changed, 8 insertions, 2 deletions
diff --git a/docs/markdown/IDE-integration.md b/docs/markdown/IDE-integration.md index 0c4f819..8e634aa 100644 --- a/docs/markdown/IDE-integration.md +++ b/docs/markdown/IDE-integration.md @@ -192,8 +192,8 @@ in a real meson run. Because of this options for the subprojects can differ. ## The dependencies section The list of all _found_ dependencies can be acquired from -`intro-dependencies.json`. Here, the name, compiler and linker arguments for -a dependency are listed. +`intro-dependencies.json`. Here, the name, version, compiler and linker +arguments for a dependency are listed. ### Scanning for dependecie with `--scan-dependencies` diff --git a/docs/markdown/snippets/introspect.md b/docs/markdown/snippets/introspect.md new file mode 100644 index 0000000..4d9fab2 --- /dev/null +++ b/docs/markdown/snippets/introspect.md @@ -0,0 +1,4 @@ +## Introspection API changes + +dependencies (--dependencies, intro-dependencies.json): +- added the `version` key diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py index b95a224..fb34b5a 100644 --- a/mesonbuild/mintro.py +++ b/mesonbuild/mintro.py @@ -299,6 +299,7 @@ def list_deps(coredata: cdata.CoreData): for d in coredata.deps.host.values(): if d.found(): result += [{'name': d.name, + 'version': d.get_version(), 'compile_args': d.get_compile_args(), 'link_args': d.get_link_args()}] return result diff --git a/run_unittests.py b/run_unittests.py index 7d0b624..6e18604 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -3820,6 +3820,7 @@ recommended as it is not supported on some platforms''') dependencies_typelist = [ ('name', str), + ('version', str), ('compile_args', list), ('link_args', list), ] |