diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-06-14 04:48:15 +0530 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-06-17 12:33:06 +0300 |
| commit | 1441cb981259dfbfd13797157eee25ce9f94169f (patch) | |
| tree | 96d76685878dd199c0f747e02a5b9eebe1fcaa99 | |
| parent | ea3e28dbb97cefac717445ec22bbec9b31234991 (diff) | |
| download | meson-1441cb981259dfbfd13797157eee25ce9f94169f.zip meson-1441cb981259dfbfd13797157eee25ce9f94169f.tar.gz meson-1441cb981259dfbfd13797157eee25ce9f94169f.tar.bz2 | |
wxwidgets: Fix usage of multiple dependency() calls
This was broken because the class property will say True but the
object property will not be set. Store the value on the class property
and transfer to object in __init__. Just like PkgConfigDependency.
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 4 | ||||
| -rw-r--r-- | test cases/frameworks/9 wxwidgets/meson.build | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index 8537a7e..b46b3d5 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -426,6 +426,8 @@ class WxDependency(ExternalDependency): self.version = 'none' if WxDependency.wx_found is None: self.check_wxconfig() + else: + self.wxc = WxDependency.wx_found if not WxDependency.wx_found: mlog.log("Neither wx-config-3.0 nor wx-config found; can't detect dependency") return @@ -480,7 +482,7 @@ class WxDependency(ExternalDependency): mlog.log('Found wx-config:', mlog.bold(shutil.which(wxc)), '(%s)' % out.strip()) self.wxc = wxc - WxDependency.wx_found = True + WxDependency.wx_found = wxc return except (FileNotFoundError, PermissionError): pass diff --git a/test cases/frameworks/9 wxwidgets/meson.build b/test cases/frameworks/9 wxwidgets/meson.build index c1fa367..da3aa26 100644 --- a/test cases/frameworks/9 wxwidgets/meson.build +++ b/test cases/frameworks/9 wxwidgets/meson.build @@ -1,5 +1,6 @@ project('wxwidgets test', 'cpp') +wxd = dependency('wxwidgets', version : '>=5', required : false) wxd = dependency('wxwidgets', version : '>=3.0.0', required : false) if wxd.found() |