aboutsummaryrefslogtreecommitdiff
path: root/docs/markdown/Reference-manual.md
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2017-08-06 13:07:46 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2017-08-06 13:07:46 +0300
commita19f906258a423bdf1b4ba60877080e5f2becc9e (patch)
treeaa9bbd9fbf7cc0e244ebb8d661d28f793052ce92 /docs/markdown/Reference-manual.md
parentb5d829e5ace703da5a230d7b109b5ae7215b1dde (diff)
parentd9f01ffcea142cdd9bf2bbf1f9213e40efc189b5 (diff)
downloadmeson-a19f906258a423bdf1b4ba60877080e5f2becc9e.zip
meson-a19f906258a423bdf1b4ba60877080e5f2becc9e.tar.gz
meson-a19f906258a423bdf1b4ba60877080e5f2becc9e.tar.bz2
Merge branch 'QuLogic-mpi'
Diffstat (limited to 'docs/markdown/Reference-manual.md')
-rw-r--r--docs/markdown/Reference-manual.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md
index ebd7b39..265f76d 100644
--- a/docs/markdown/Reference-manual.md
+++ b/docs/markdown/Reference-manual.md
@@ -193,6 +193,7 @@ Finds an external dependency with the given name with `pkg-config` if possible a
- `fallback` specifies a subproject fallback to use in case the dependency is not found in the system. The value is an array `['subproj_name', 'subproj_dep']` where the first value is the name of the subproject and the second is the variable name in that subproject that contains the value of [`declare_dependency`](#declare_dependency).
- `default_options` *(added 0.37.0)* an array of option values that override those set in the project's `default_options` invocation (like `default_options` in [`project()`](#project), they only have effect when Meson is run for the first time, and command line arguments override any default options in build files)
- `method` defines the way the dependency is detected, the default is `auto` but can be overridden to be e.g. `qmake` for Qt development, and different dependencies support different values for this (though `auto` will work on all of them)
+- `language` *(added 0.42.0)* defines what language-specific dependency to find if it's available for multiple languages.
The returned object also has methods that are documented in the [object methods section](#dependency-object) below.