aboutsummaryrefslogtreecommitdiff
path: root/docs/markdown/Reference-manual.md
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2020-01-27 18:29:22 +0200
committerGitHub <noreply@github.com>2020-01-27 18:29:22 +0200
commita51c9af921d0ba05aa173b8a1a4351eacb575be0 (patch)
tree8207935e73c6c8e82f8c38c1ff130cbfe5642249 /docs/markdown/Reference-manual.md
parent9e07f8d8e6bb088252ac11b3e663ff3d93c8020a (diff)
parent202c89d0b665a536a738c59dcde1f374047a346e (diff)
downloadmeson-a51c9af921d0ba05aa173b8a1a4351eacb575be0.zip
meson-a51c9af921d0ba05aa173b8a1a4351eacb575be0.tar.gz
meson-a51c9af921d0ba05aa173b8a1a4351eacb575be0.tar.bz2
Merge pull request #6423 from dcbaker/declare-dependency-variables
Add ability to set and query arbitrary variables on declare_dependency objects
Diffstat (limited to 'docs/markdown/Reference-manual.md')
-rw-r--r--docs/markdown/Reference-manual.md9
1 files changed, 7 insertions, 2 deletions
diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md
index 6699d75..57fc1f7 100644
--- a/docs/markdown/Reference-manual.md
+++ b/docs/markdown/Reference-manual.md
@@ -413,6 +413,9 @@ keyword arguments.
- `sources`, sources to add to targets (or generated header files
that should be built before sources including them are built)
- `version`, the version of this dependency, such as `1.2.3`
+ - `variables`, a dictionary of arbitrary strings, this is meant to be used
+ in subprojects where special variables would be provided via cmake or
+ pkg-config. Since 0.54.0
### dependency()
@@ -2373,14 +2376,16 @@ an external dependency with the following methods:
- sources: any compiled or static sources the dependency has
- `get_variable(cmake : str, pkgconfig : str, configtool : str,
- default_value : str, pkgconfig_define : [str, str])` *(Added in
- 0.51.0)* A generic variable getter method, which replaces the
+ internal: str, default_value : str, pkgconfig_define : [str, str])`
+ *(Added in 0.51.0)* A generic variable getter method, which replaces the
get_*type*_variable methods. This allows one to get the variable
from a dependency without knowing specifically how that dependency
was found. If default_value is set and the value cannot be gotten
from the object then default_value is returned, if it is not set
then an error is raised.
+ *New in 0.54.0, the `internal` keyword*
+
### `disabler` object
A disabler object is an object that behaves in much the same way as