From cd509043e097a44f6f5195b6e842dfefbaa79104 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Tue, 21 Jun 2016 02:46:11 +0530 Subject: [PATCH] wxwidgets: Don't error out if dependency is not required (#606) --- mesonbuild/dependencies.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py index e2c932e5a..e70e1a74b 100644 --- a/mesonbuild/dependencies.py +++ b/mesonbuild/dependencies.py @@ -256,12 +256,13 @@ class WxDependency(Dependency): def __init__(self, environment, kwargs): Dependency.__init__(self) + self.is_found = False if WxDependency.wx_found is None: self.check_wxconfig() - if not WxDependency.wx_found: - raise DependencyException('Wx-config not found.') - self.is_found = False + mlog.log("Neither wx-config-3.0 nor wx-config found; can't detect dependency") + return + p = subprocess.Popen([self.wxc, '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)