summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2017-10-25 10:17:32 -0700
committerDylan Baker <dylan@pnwbakers.com>2017-11-23 20:06:23 -0800
commite95628306dc1364ceaffed85f7fb36d312c0f13e (patch)
tree83fd23b9d8d3e1054b1e4b069b60977850a74fe4
parentf818e9df582e27d73a36c0b7a94dc897a6e6dc62 (diff)
downloadmeson-e95628306dc1364ceaffed85f7fb36d312c0f13e.tar.gz
docs: consolidate config-tool based dependencies
There are currently entries for cups and pcap; but not LLVM, GnuStep, or WxWidgets. Instead of having an entry for each of these just have a single entry for all of them, since the majority of the information is duplicated between them anyway.
-rw-r--r--docs/markdown/Dependencies.md28
1 files changed, 9 insertions, 19 deletions
diff --git a/docs/markdown/Dependencies.md b/docs/markdown/Dependencies.md
index 8e780d6bc..dbd21aa61 100644
--- a/docs/markdown/Dependencies.md
+++ b/docs/markdown/Dependencies.md
@@ -178,32 +178,22 @@ the list of sources for the target. The `modules` keyword of
`dependency` works just like it does with Boost. It tells which
subparts of Qt the program uses.
-## Pcap
+## Dependencies using config tools
-The pcap library does not ship with pkg-config at the time or writing
-but instead it has its own `pcap-config` util. Meson will use it
-automatically:
+CUPS, LLVM, PCAP, WxWidgets, libwmf, and GnuStep either do not provide
+pkg-config modules or additionally can be detected via a config tool
+(cups-config, llvm-config, etc). Meson has native support for these tools, and
+then can be found like other dependencies:
```meson
pcap_dep = dependency('pcap', version : '>=1.0')
-```
-
-## CUPS
-
-The cups library does not ship with pkg-config at the time or writing
-but instead it has its own `cups-config` util. Meson will use it
-automatically:
-
-```meson
cups_dep = dependency('cups', version : '>=1.4')
+llvm_dep = dependency('llvm', version : '>=4.0')
```
-## LibWMF
-
-The libwmf library does not ship with pkg-config at the time or writing
-but instead it has its own `libwmf-config` util. Meson will use it
-automatically:
+Some of these tools (like wmf and cups) provide both pkg-config and config
+tools support. You can force one or another via the method keyword:
```meson
-libwmf_dep = dependency('libwmf', version : '>=0.2.8')
+wmf_dep = dependency('wmf', method : 'config-tool')
```