diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2022-03-07 22:51:40 -0500 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2022-03-07 22:51:40 -0500 |
| commit | 789f440f7c2bfda2e17f05ecdcb1a19245f892df (patch) | |
| tree | e51d35a7820e1357477c2a4f55ecf8ac3cc0530b /docs/markdown | |
| parent | 2540ad6e9e08370ddd0b6753fdc9314945a672f0 (diff) | |
| download | meson-789f440f7c2bfda2e17f05ecdcb1a19245f892df.zip meson-789f440f7c2bfda2e17f05ecdcb1a19245f892df.tar.gz meson-789f440f7c2bfda2e17f05ecdcb1a19245f892df.tar.bz2 | |
docs: add forgotten documentation for the new openssl dependency
Diffstat (limited to 'docs/markdown')
| -rw-r--r-- | docs/markdown/Dependencies.md | 6 | ||||
| -rw-r--r-- | docs/markdown/snippets/openssl_dependency.md | 11 |
2 files changed, 17 insertions, 0 deletions
diff --git a/docs/markdown/Dependencies.md b/docs/markdown/Dependencies.md index 8165955..15da929 100644 --- a/docs/markdown/Dependencies.md +++ b/docs/markdown/Dependencies.md @@ -625,6 +625,12 @@ for OpenMP support. The `language` keyword may used. +## OpenSSL + +*(added 0.62.0)* + +`method` may be `auto`, `pkg-config`, `system` or `cmake`. + ## pcap *(added 0.42.0)* diff --git a/docs/markdown/snippets/openssl_dependency.md b/docs/markdown/snippets/openssl_dependency.md new file mode 100644 index 0000000..f6f9b63 --- /dev/null +++ b/docs/markdown/snippets/openssl_dependency.md @@ -0,0 +1,11 @@ +## New custom dependency for OpenSSL + +Detecting an OpenSSL installation in a cross-platform manner can be +complicated. Officially, pkg-config is supported by upstream. Unofficially, +cmake includes a FindOpenSSL using a different name and which requires +specifying modules. + +Meson will now allow the pkg-config name to work in all cases using the following lookup order: +- prefer pkg-config if at all possible +- attempt to probe the system for the standard library naming, and retrieve the version from the headers +- if all else fails, check if cmake can find it |