aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Griffis <tingping@tingping.se>2017-09-02 17:36:46 -0400
committerJussi Pakkanen <jpakkane@gmail.com>2017-09-03 13:23:37 +0300
commit2acf737b4b5cf70dd3fb87573ae75a8654d40fef (patch)
tree37ce4443ba0b3006608df66baf4d936035c4a6b8
parent437fc04da1a6961cc27510d58d2f0a38b71eb526 (diff)
downloadmeson-2acf737b4b5cf70dd3fb87573ae75a8654d40fef.zip
meson-2acf737b4b5cf70dd3fb87573ae75a8654d40fef.tar.gz
meson-2acf737b4b5cf70dd3fb87573ae75a8654d40fef.tar.bz2
pkgconfig: Document url keyword
Closes #2272
-rw-r--r--docs/markdown/Pkgconfig-module.md1
-rw-r--r--mesonbuild/modules/pkgconfig.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/markdown/Pkgconfig-module.md b/docs/markdown/Pkgconfig-module.md
index 8814d19..5a660fd 100644
--- a/docs/markdown/Pkgconfig-module.md
+++ b/docs/markdown/Pkgconfig-module.md
@@ -34,6 +34,7 @@ keyword arguments.
- `requires` list of strings to put in the `Requires` field
- `requires_private` list of strings to put in the `Requires.private`
field
+- `url` a string with a url for the library
- `variables` a list of strings with custom variables to add to the
generated file. The strings must be in the form `name=value` and may
reference other pkgconfig variables,
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py
index 5d98167..0a0498c 100644
--- a/mesonbuild/modules/pkgconfig.py
+++ b/mesonbuild/modules/pkgconfig.py
@@ -121,7 +121,7 @@ class PkgConfigModule(ExtensionModule):
@permittedKwargs({'libraries', 'version', 'name', 'description', 'filebase',
'subdirs', 'requires', 'requires_private', 'libraries_private',
- 'install_dir', 'extra_cflags', 'variables'})
+ 'install_dir', 'extra_cflags', 'variables', 'url'})
def generate(self, state, args, kwargs):
if len(args) > 0:
raise mesonlib.MesonException('Pkgconfig_gen takes no positional arguments.')