aboutsummaryrefslogtreecommitdiff
path: root/docs/markdown
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2017-12-31 19:11:57 +0200
committerGitHub <noreply@github.com>2017-12-31 19:11:57 +0200
commitdd3f49af0d8c94033e6db68b25c23ea9e63e9c5c (patch)
treecfae667dcb4b0ad3266d47134354636a1f3ba059 /docs/markdown
parent500c39cb07d21aa6857e204f6689d324afd758c4 (diff)
parent68eedc8b7157190a010d31bea81f13f91144ea75 (diff)
downloadmeson-dd3f49af0d8c94033e6db68b25c23ea9e63e9c5c.zip
meson-dd3f49af0d8c94033e6db68b25c23ea9e63e9c5c.tar.gz
meson-dd3f49af0d8c94033e6db68b25c23ea9e63e9c5c.tar.bz2
Merge pull request #2757 from xclaesse/pkgconfig
pkgconfig: Allow passing Dependency objects to library(_private)
Diffstat (limited to 'docs/markdown')
-rw-r--r--docs/markdown/Pkgconfig-module.md13
1 files changed, 10 insertions, 3 deletions
diff --git a/docs/markdown/Pkgconfig-module.md b/docs/markdown/Pkgconfig-module.md
index 7f767f1..cbe01b4 100644
--- a/docs/markdown/Pkgconfig-module.md
+++ b/docs/markdown/Pkgconfig-module.md
@@ -23,9 +23,16 @@ keyword arguments.
- `install_dir` the directory to install to, defaults to the value of
option `libdir` followed by `/pkgconfig`
- `libraries` a list of built libraries (usually results of
- shared_library) that the user needs to link against
-- `libraries_private` list of strings to put in the
- `Libraries.private` field
+ shared_library) that the user needs to link against. Arbitraty strings can
+ also be provided and they will be added into the `Libs` field. Since 0.45.0
+ dependencies of built libraries will be automatically added to `Libs.private`
+ field. If a dependency is provided by pkg-config then it will be added in
+ `Requires.private` instead. Other type of dependency objects can also be passed
+ and will result in their `link_args` and `compile_args` to be added to `Libs`
+ and `Cflags` fields.
+- `libraries_private` list of built libraries or strings to put in the
+ `Libs.private` field. Since 0.45.0 it can also contain dependency objects,
+ their `link_args` will be added to `Libs.private`.
- `name` the name of this library
- `subdirs` which subdirs of `include` should be added to the header
search path, for example if you install headers into