diff options
| -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() |