aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mesonbuild/compilers.py2
-rw-r--r--mesonbuild/dependencies.py7
2 files changed, 6 insertions, 3 deletions
diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py
index 99b420f..be96639 100644
--- a/mesonbuild/compilers.py
+++ b/mesonbuild/compilers.py
@@ -821,6 +821,8 @@ void bar() {
return 0;
}
'''
+ if extra_dirs and isinstance(extra_dirs, str):
+ extra_dirs = [extra_dirs]
# Gcc + co seem to prefer builtin lib dirs to -L dirs.
# Only try to find std libs if no extra dirs specified.
if len(extra_dirs) == 0:
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)