aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2021-08-23 21:38:22 +0200
committerDaniel Mensinger <daniel@mensinger-ka.de>2021-10-03 12:19:45 +0200
commitaf24d188424093605e34a634feca421fad443399 (patch)
treecd16c6162e96e11457b11a42c9f393c1675c4019
parent239219220e2711ae2e6f79e952103f767c384673 (diff)
downloadmeson-af24d188424093605e34a634feca421fad443399.zip
meson-af24d188424093605e34a634feca421fad443399.tar.gz
meson-af24d188424093605e34a634feca421fad443399.tar.bz2
docs: Added new static docs
-rw-r--r--docs/yaml/builtins/meson.yaml8
-rw-r--r--docs/yaml/functions/dependency.yaml3
2 files changed, 11 insertions, 0 deletions
diff --git a/docs/yaml/builtins/meson.yaml b/docs/yaml/builtins/meson.yaml
index 30afafd..f8c4e78 100644
--- a/docs/yaml/builtins/meson.yaml
+++ b/docs/yaml/builtins/meson.yaml
@@ -358,6 +358,14 @@ methods:
Otherwise, the dependency is overwritten for the host machine, which
differs from the build machine when cross-compiling.
+ static:
+ type: bool
+ since: 0.60.0
+ description: |
+ Used to override static and/or shared dependencies separately.
+ If not specified it is assumed
+ `dep_object` follows `default_library` option value.
+
- name: is_cross_build
returns: bool
description: Returns `true` if the current build is a [cross build](Cross-compilation.md) and `false` otherwise.
diff --git a/docs/yaml/functions/dependency.yaml b/docs/yaml/functions/dependency.yaml
index e0c8ad3..1a01bbc 100644
--- a/docs/yaml/functions/dependency.yaml
+++ b/docs/yaml/functions/dependency.yaml
@@ -146,6 +146,9 @@ kwargs:
libraries instead of dynamic ones (note that this is not supported
by all dependency backends)
+ *Since 0.60.0* it also sets `default_library` option accordingly on the fallback
+ subproject if it was not set explicitly in `default_options` keyword argument.
+
version:
type: str
since: 0.37.0