aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek.chauhan@gmail.com>2016-06-21 02:46:11 +0530
committerJussi Pakkanen <jpakkane@gmail.com>2016-06-21 00:16:11 +0300
commitcd509043e097a44f6f5195b6e842dfefbaa79104 (patch)
treedf7a79e832ab8a3f4f4db422d7cfbb1f65087478
parent7c90beefde03703a12036ee4a884bafe5b49aad6 (diff)
downloadmeson-cd509043e097a44f6f5195b6e842dfefbaa79104.zip
meson-cd509043e097a44f6f5195b6e842dfefbaa79104.tar.gz
meson-cd509043e097a44f6f5195b6e842dfefbaa79104.tar.bz2
wxwidgets: Don't error out if dependency is not required (#606)
-rw-r--r--mesonbuild/dependencies.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py
index e2c932e..e70e1a7 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)