summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2020-01-23 09:15:58 -0800
committerDylan Baker <dylan@pnwbakers.com>2020-01-31 09:28:56 -0800
commitb0c219b9bb37e2d60992ff45796168ae0bf63b4b (patch)
tree078821faa99da7d099ae5bf0567a2eb0dabf476f
parente728331cc8bd48f318e5371b4eb61f2caf1940b2 (diff)
downloadmeson-b0c219b9bb37e2d60992ff45796168ae0bf63b4b.tar.gz
docs: Update dependency docs for zlib
-rw-r--r--docs/markdown/Dependencies.md11
1 files changed, 11 insertions, 0 deletions
diff --git a/docs/markdown/Dependencies.md b/docs/markdown/Dependencies.md
index cf2744f35..50ea92fee 100644
--- a/docs/markdown/Dependencies.md
+++ b/docs/markdown/Dependencies.md
@@ -572,6 +572,17 @@ that it is not possible to obtain the shaderc version using this method.
`method` may be `auto`, `pkg-config` or `system`.
+## Zlib
+
+Zlib ships with pkg-config and cmake support, but on some operating systems
+(windows, macOs, FreeBSD, dragonflybsd), it is provided as part of the base
+operating system without pkg-config support. The new System finder can be used
+on these OSes to link with the bundled version.
+
+`method` may be `auto`, `pkg-config`, `cmake`, or `system`.
+
+*New in 0.54.0* the `system` method.
+
<hr>
<a name="footnote1">1</a>: They may appear to be case-insensitive, if the
underlying file system happens to be case-insensitive.