diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-12-06 20:26:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-06 20:26:30 +0200 |
| commit | 66ed54a94e6511a72fa6a980108aea6301f6c60f (patch) | |
| tree | 0d2258aded61bd2573259b113fa168f16e03db90 /mesonbuild/modules | |
| parent | 228a9035af26515481a686b8940968ea924f85fd (diff) | |
| parent | ff55e848f6e53e713c923b9e4a79668ae3ad20c5 (diff) | |
| download | meson-66ed54a94e6511a72fa6a980108aea6301f6c60f.zip meson-66ed54a94e6511a72fa6a980108aea6301f6c60f.tar.gz meson-66ed54a94e6511a72fa6a980108aea6301f6c60f.tar.bz2 | |
Merge pull request #1144 from valum-framework/always-add-version-in-pkg-config
pkgconfig: 'Version' must be specified, even if it's empty
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index 73b29ae..f74f9e9 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -55,8 +55,7 @@ class PkgConfigModule: ofile.write('Description: %s\n' % description) if len(url) > 0: ofile.write('URL: %s\n' % url) - if len(version) > 0: - ofile.write('Version: %s\n' % version) + ofile.write('Version: %s\n' % version) if len(pub_reqs) > 0: ofile.write('Requires: {}\n'.format(' '.join(pub_reqs))) if len(priv_reqs) > 0: @@ -112,9 +111,9 @@ class PkgConfigModule: libs = self.process_libs(kwargs.get('libraries', [])) priv_libs = self.process_libs(kwargs.get('libraries_private', [])) subdirs = mesonlib.stringlistify(kwargs.get('subdirs', ['.'])) - version = kwargs.get('version', '') + version = kwargs.get('version', None) if not isinstance(version, str): - raise mesonlib.MesonException('Version must be a string.') + raise mesonlib.MesonException('Version must be specified.') name = kwargs.get('name', None) if not isinstance(name, str): raise mesonlib.MesonException('Name not specified.') |