diff options
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 2 | ||||
| -rwxr-xr-x | run_unittests.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index a46afbb..016eace 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -526,7 +526,7 @@ class SDL2Dependency(ExternalDependency): class WxDependency(ConfigToolDependency): - tools = ['wx-config-3.0', 'wx-config'] + tools = ['wx-config-3.0', 'wx-config', 'wx-config-gtk3'] tool_name = 'wx-config' def __init__(self, environment, kwargs): diff --git a/run_unittests.py b/run_unittests.py index e9e9abf..80864c9 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -2856,15 +2856,15 @@ class FailureTests(BasePlatformTests): def test_wx_notfound_dependency(self): # Want to test failure, so skip if available - if shutil.which('wx-config-3.0') or shutil.which('wx-config'): - raise unittest.SkipTest('wx-config or wx-config-3.0 found') + if shutil.which('wx-config-3.0') or shutil.which('wx-config') or shutil.which('wx-config-gtk3'): + raise unittest.SkipTest('wx-config, wx-config-3.0 or wx-config-gtk3 found') self.assertMesonRaises("dependency('wxwidgets')", self.dnf) self.assertMesonOutputs("dependency('wxwidgets', required : false)", "Dependency .*WxWidgets.* found: .*NO.*") def test_wx_dependency(self): - if not shutil.which('wx-config-3.0') and not shutil.which('wx-config'): - raise unittest.SkipTest('Neither wx-config nor wx-config-3.0 found') + if not shutil.which('wx-config-3.0') and not shutil.which('wx-config') and not shutil.which('wx-config-gtk3'): + raise unittest.SkipTest('Neither wx-config, wx-config-3.0 nor wx-config-gtk3 found') self.assertMesonRaises("dependency('wxwidgets', modules : 1)", "module argument is not a string") |