diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-04-06 23:10:20 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-04-06 23:10:20 +0300 |
commit | cab5ce4fc0eeee6024632cfb3815a7b6e3b70885 (patch) | |
tree | 70ce279332b2c3730204ffa7dc2e9b01059c5921 /mesonbuild/modules/pkgconfig.py | |
parent | 5d53c6b7415b62f2172129a61770cf38aa3f3c1d (diff) | |
parent | 3f3fcace3d91da7d2643354e06a4b8d3c7143f86 (diff) | |
download | meson-cab5ce4fc0eeee6024632cfb3815a7b6e3b70885.zip meson-cab5ce4fc0eeee6024632cfb3815a7b6e3b70885.tar.gz meson-cab5ce4fc0eeee6024632cfb3815a7b6e3b70885.tar.bz2 |
Merge pull request #438 from trhd/testing_options
New options for controlling test output.
Diffstat (limited to 'mesonbuild/modules/pkgconfig.py')
-rw-r--r-- | mesonbuild/modules/pkgconfig.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index ffe03e2..fe5ca45 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -55,7 +55,7 @@ class PkgConfigModule: def generate(self, state, args, kwargs): if len(args) > 0: - raise coredata.MesonException('Pkgconfig_gen takes no positional arguments.') + raise mesonlib.MesonException('Pkgconfig_gen takes no positional arguments.') libs = kwargs.get('libraries', []) if not isinstance(libs, list): libs = [libs] @@ -64,22 +64,22 @@ class PkgConfigModule: if hasattr(l, 'held_object'): l = l.held_object if not (isinstance(l, build.SharedLibrary) or isinstance(l, build.StaticLibrary)): - raise coredata.MesonException('Library argument not a library object.') + raise mesonlib.MesonException('Library argument not a library object.') processed_libs.append(l) libs = processed_libs subdirs = mesonlib.stringlistify(kwargs.get('subdirs', ['.'])) version = kwargs.get('version', '') if not isinstance(version, str): - raise coredata.MesonException('Version must be a string.') + raise mesonlib.MesonException('Version must be a string.') name = kwargs.get('name', None) if not isinstance(name, str): - raise coredata.MesonException('Name not specified.') + raise mesonlib.MesonException('Name not specified.') filebase = kwargs.get('filebase', name) if not isinstance(filebase, str): - raise coredata.MesonException('Filebase must be a string.') + raise mesonlib.MesonException('Filebase must be a string.') description = kwargs.get('description', None) if not isinstance(description, str): - raise coredata.MesonException('Description is not a string.') + raise mesonlib.MesonException('Description is not a string.') pub_reqs = mesonlib.stringlistify(kwargs.get('requires', [])) priv_reqs = mesonlib.stringlistify(kwargs.get('requires_private', [])) priv_libs = mesonlib.stringlistify(kwargs.get('libraries_private', [])) |