diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-06-05 05:15:53 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-06-09 20:21:01 +0530 |
| commit | c4d7667675760d43596853f7bac9db38b82e798b (patch) | |
| tree | 75df01c9268f21651b748e4f3d29f2cc2ff9c512 | |
| parent | 0b08d5aab5f904ad584a3a215997f3b74d5aecea (diff) | |
| download | meson-c4d7667675760d43596853f7bac9db38b82e798b.zip meson-c4d7667675760d43596853f7bac9db38b82e798b.tar.gz meson-c4d7667675760d43596853f7bac9db38b82e798b.tar.bz2 | |
ExtraFrameworkDependency: Don't set required
Otherwise we will never hit the informative DependencyException.
| -rw-r--r-- | mesonbuild/dependencies/base.py | 4 | ||||
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index d727021..00a14be 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -139,7 +139,7 @@ class ExternalDependency(Dependency): self.static = kwargs.get('static', False) if not isinstance(self.static, bool): raise DependencyException('Static keyword must be boolean') - # Is this dependency for cross-com,pilation? + # Is this dependency for cross-compilation? if 'native' in kwargs and self.env.is_cross_build(): self.want_cross = not kwargs['native'] else: @@ -619,7 +619,7 @@ def find_external_dependency(name, env, kwargs): except Exception as e: pkg_exc = e if mesonlib.is_osx(): - fwdep = ExtraFrameworkDependency(name, required, None, env, kwargs) + fwdep = ExtraFrameworkDependency(name, False, None, env, None, kwargs) if required and not fwdep.found(): m = 'Dependency {!r} not found, tried Extra Frameworks ' \ 'and Pkg-Config:\n\n' + str(pkg_exc) diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index 7b276cc..7a66a2d 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -310,7 +310,8 @@ class QtBaseDependency(ExternalDependency): libdir = qvars['QT_INSTALL_LIBS'] for m in modules: fname = 'Qt' + m - fwdep = ExtraFrameworkDependency(fname, kwargs.get('required', True), libdir, kwargs) + fwdep = ExtraFrameworkDependency(fname, False, libdir, self.env, + self.language, kwargs) self.cargs.append('-F' + libdir) if fwdep.found(): self.is_found = True @@ -400,7 +401,8 @@ class SDL2Dependency(ExternalDependency): mlog.debug('Could not find sdl2-config binary, trying next.') if DependencyMethods.EXTRAFRAMEWORK in self.methods: if mesonlib.is_osx(): - fwdep = ExtraFrameworkDependency('sdl2', False, None, kwargs) + fwdep = ExtraFrameworkDependency('sdl2', False, None, self.env, + self.language, kwargs) if fwdep.found(): self.is_found = True self.compile_args = fwdep.get_compile_args() |