aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2017-03-24 14:18:44 +0530
committerJussi Pakkanen <jpakkane@gmail.com>2017-03-25 21:07:22 +0200
commit6946029d16bd32799b4a377ee357d1fc1c6cf536 (patch)
treec171fadb29ebcc522630a9bbf0a34685a2913685
parent3bb3c9ce52fe10025df04b7aeb169a3981f73377 (diff)
downloadmeson-6946029d16bd32799b4a377ee357d1fc1c6cf536.zip
meson-6946029d16bd32799b4a377ee357d1fc1c6cf536.tar.gz
meson-6946029d16bd32799b4a377ee357d1fc1c6cf536.tar.bz2
Fix regen when using pkg-deps when there's no pkg-config
Without this, we'd fail with a "no attribute modversion" error.
-rw-r--r--mesonbuild/dependencies.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py
index 031e106..6fff39b 100644
--- a/mesonbuild/dependencies.py
+++ b/mesonbuild/dependencies.py
@@ -112,6 +112,7 @@ class PkgConfigDependency(Dependency):
else:
self.want_cross = environment.is_cross_build()
self.name = name
+ self.modversion = 'none'
# When finding dependencies for cross-compiling, we don't care about
# the 'native' pkg-config
@@ -154,7 +155,6 @@ class PkgConfigDependency(Dependency):
if self.required:
raise DependencyException('{} dependency {!r} not found'
''.format(self.type_string, name))
- self.modversion = 'none'
return
found_msg = [self.type_string + ' dependency', mlog.bold(name), 'found:']
self.version_reqs = kwargs.get('version', None)