Also check wx-config-gtk3 when looking for wxWidgets
On Arch Linux the wxgtk3 package doesn't provide wx-config.
This commit is contained in:
parent
87750bf988
commit
d0648ee077
|
@ -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):
|
||||
|
|
|
@ -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")
|
||||
|
||||
|
|
Loading…
Reference in New Issue