diff options
Diffstat (limited to 'docs/markdown')
| -rw-r--r-- | docs/markdown/Dependencies.md | 28 | ||||
| -rw-r--r-- | docs/markdown/Reference-manual.md | 4 | ||||
| -rw-r--r-- | docs/markdown/snippets/config-tool-variable-method.md | 11 |
3 files changed, 24 insertions, 19 deletions
diff --git a/docs/markdown/Dependencies.md b/docs/markdown/Dependencies.md index 8e780d6..dbd21aa 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') ``` diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md index 0f00203..424ab58 100644 --- a/docs/markdown/Reference-manual.md +++ b/docs/markdown/Reference-manual.md @@ -1614,6 +1614,10 @@ an external dependency with the following methods: pkg-config variable specified, or, if invoked on a non pkg-config dependency, error out + - `get_configtool_variable(varname)` (*Added 0.44.0*) will get the + command line argument from the config tool (with `--` prepended), or, + if invoked on a non config-tool dependency, error out. + - `type_name()` which returns a string describing the type of the dependency, the most common values are `internal` for deps created with `declare_dependencies` and `pkgconfig` for system dependencies diff --git a/docs/markdown/snippets/config-tool-variable-method.md b/docs/markdown/snippets/config-tool-variable-method.md new file mode 100644 index 0000000..7725982 --- /dev/null +++ b/docs/markdown/snippets/config-tool-variable-method.md @@ -0,0 +1,11 @@ +# Config-Tool based dependencies gained a method to get arbitrary options + +A number of dependencies (CUPS, LLVM, pcap, WxWidgets, GnuStep) use a config +tool instead of pkg-config. As of this version they now have a +`get_configtool_variable` method, which is analogous to the +`get_pkgconfig_variable` for pkg config. + +```meson +dep_llvm = dependency('LLVM') +llvm_inc_dir = dep_llvm.get_configtool_variable('includedir') +``` |