diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-03-12 23:02:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-12 23:02:36 +0200 |
| commit | 6585427a7d03e32770769863e1ae8902d4480745 (patch) | |
| tree | 4ee1359c40352a554e1eaf219b6b31b8b3eecdb2 /docs | |
| parent | 28b19c78d6f9e12f9fc0f79748adbfed613eafc9 (diff) | |
| parent | 2377f22ea594ee10c98e90df438d437362cca5ea (diff) | |
| download | meson-6585427a7d03e32770769863e1ae8902d4480745.zip meson-6585427a7d03e32770769863e1ae8902d4480745.tar.gz meson-6585427a7d03e32770769863e1ae8902d4480745.tar.bz2 | |
Merge pull request #3131 from sarum9in/pkgconfig
Pkgconfig accepts libraries and pkgconfig-dependencies in requires/requires_private parameters
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/markdown/Pkgconfig-module.md | 5 | ||||
| -rw-r--r-- | docs/markdown/snippets/pkgconfig-requires-non-string.md | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/docs/markdown/Pkgconfig-module.md b/docs/markdown/Pkgconfig-module.md index cbe01b4..853cf50 100644 --- a/docs/markdown/Pkgconfig-module.md +++ b/docs/markdown/Pkgconfig-module.md @@ -38,8 +38,9 @@ keyword arguments. search path, for example if you install headers into `${PREFIX}/include/foobar-1`, the correct value for this argument would be `foobar-1` -- `requires` list of strings to put in the `Requires` field -- `requires_private` list of strings to put in the `Requires.private` +- `requires` list of strings, pkgconfig-dependencies or libraries that + `pkgconfig.generate()` was used on to put in the `Requires` field +- `requires_private` same as `requires` but for `Requires.private` field field - `url` a string with a url for the library - `variables` a list of strings with custom variables to add to the diff --git a/docs/markdown/snippets/pkgconfig-requires-non-string.md b/docs/markdown/snippets/pkgconfig-requires-non-string.md new file mode 100644 index 0000000..fc848a8 --- /dev/null +++ b/docs/markdown/snippets/pkgconfig-requires-non-string.md @@ -0,0 +1,5 @@ +# pkgconfig.generate() requires parameters non-string arguments + +`pkgconfig.generate()` `requires` and `requires_private` parameters +accept pkgconfig-dependencies and libraries that pkgconfig-files were +generated for. |