Merge branch 'QuLogic-mpi'

3 files changed, 24 insertions, 0 deletions

diff --git a/docs/markdown/Dependencies.md b/docs/markdown/Dependencies.md
index 1851233..401e019 100644
--- a/docs/markdown/Dependencies.md
+++ b/docs/markdown/Dependencies.md
@@ -51,6 +51,21 @@ If your boost headers or libraries are in non-standard locations you can set the
 
 GTest and GMock come as sources that must be compiled as part of your project. With Meson you don't have to care about the details, just pass `gtest` or `gmock` to `dependency` and it will do everything for you. If you want to use GMock, it is recommended to use GTest as well, as getting it to work standalone is tricky.
 
+## MPI ##
+
+MPI is supported for C, C++ and Fortran. Because dependencies are
+language-specific, you must specify the requested language using the
+`language` keyword argument, i.e.,
+ * `dependency('mpi', language='c')` for the C MPI headers and libraries
+ * `dependency('mpi', language='cpp')` for the C++ MPI headers and libraries
+ * `dependency('mpi', language='fortran')` for the Fortran MPI headers and libraries
+
+Meson prefers pkg-config for MPI, but if your MPI implementation does not
+provide them, it will search for the standard wrapper executables, `mpic`,
+`mpicxx`, `mpic++`, `mpifort`, `mpif90`, `mpif77`. If these are not in your
+path, they can be specified by setting the standard environment variables
+`MPICC`, `MPICXX`, `MPIFC`, `MPIF90`, or `MPIF77`, during configuration.
+
 ## Qt5 ##
 
 Meson has native Qt5 support. Its usage is best demonstrated with an example.
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.
 
diff --git a/docs/markdown/Release-notes-for-0.42.0.md b/docs/markdown/Release-notes-for-0.42.0.md
index 0fa27c3..f3127de 100644
--- a/docs/markdown/Release-notes-for-0.42.0.md
+++ b/docs/markdown/Release-notes-for-0.42.0.md
@@ -104,3 +104,11 @@ By default Meson adds the current source and build directories to the
 header search path. On some rare occasions this is not desired. Setting
 the `implicit_include_directories` keyword argument to `false` these
 directories are not used.
+
+## Support for MPI dependency
+
+MPI is now supported as a dependency. Because dependencies are
+language-specific, you must specify the requested language with the `language`
+keyword, i.e., `dependency('mpi', language='c')` will request the C MPI headers
+and libraries. See [the MPI dependency](Dependencies.md#mpi) for more
+information.