aboutsummaryrefslogtreecommitdiff
path: root/docs/markdown/Reference-manual.md
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2018-11-22 21:30:12 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2018-11-22 22:30:12 +0200
commita0175ecb1412ed1c824e5eaf1629be9ed95f0b78 (patch)
treed3ac1d8f77b921d1517ca4b7290b8ed37ea7ea08 /docs/markdown/Reference-manual.md
parent8b88fb990e165a501c3b5798139c21647218c978 (diff)
downloadmeson-a0175ecb1412ed1c824e5eaf1629be9ed95f0b78.zip
meson-a0175ecb1412ed1c824e5eaf1629be9ed95f0b78.tar.gz
meson-a0175ecb1412ed1c824e5eaf1629be9ed95f0b78.tar.bz2
CMake find_package dependency backend (#4444)
Diffstat (limited to 'docs/markdown/Reference-manual.md')
-rw-r--r--docs/markdown/Reference-manual.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md
index 7df0717..a723b03 100644
--- a/docs/markdown/Reference-manual.md
+++ b/docs/markdown/Reference-manual.md
@@ -365,10 +365,10 @@ keyword arguments.
```
Finds an external dependency (usually a library installed on your
-system) with the given name with `pkg-config` if possible, as a
-framework (OSX only), and with
+system) with the given name with `pkg-config` and [with CMake](Dependencies.md#CMake)
+if `pkg-config` fails. Additionally, frameworks (OSX only) and
[library-specific fallback detection logic](Dependencies.md#dependencies-with-custom-lookup-functionality)
-otherwise. This function supports the following keyword arguments:
+are also supported. This function supports the following keyword arguments:
- `default_options` *(added 0.37.0)* an array of default option values
that override those set in the subproject's `meson_options.txt`
@@ -1442,7 +1442,7 @@ be up to date on every build. Keywords are similar to `custom_target`.
Meson will read the contents of `input`, substitute the
`replace_string` with the detected revision number, and write the
-result to `output`. This method returns a
+result to `output`. This method returns a
[`custom_target`](#custom_target) object that (as usual) should be
used to signal dependencies if other targets use the file outputted
by this.