diff options
| -rw-r--r-- | dependencies.py | 9 | ||||
| -rw-r--r-- | test cases/frameworks/9 wxwidgets/meson.build | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/dependencies.py b/dependencies.py index 74f1d30..28bbbee 100644 --- a/dependencies.py +++ b/dependencies.py @@ -165,11 +165,16 @@ class WxDependency(Dependency): mlog.log('Dependency wxwidgets found:', mlog.red('NO')) self.cargs = [] self.libs = [] - self.is_found = False else: + self.modversion = out.decode().strip() + version_req = kwargs.get('version', None) + if version_req is not None: + if not mesonlib.version_compare(self.modversion, version_req): + mlog.log('Wxwidgets version %s does not fullfill requirement %s' %\ + (self.modversion, version_req)) + return mlog.log('Dependency wxwidgets found:', mlog.green('YES')) self.is_found = True - self.modversion = out.decode().strip() # wx-config seems to have a cflags as well but since it requires C++, # this should be good, at least for now. p = subprocess.Popen([self.wxc, '--cxxflags'], stdout=subprocess.PIPE, diff --git a/test cases/frameworks/9 wxwidgets/meson.build b/test cases/frameworks/9 wxwidgets/meson.build index 5de2b91..ecf0b39 100644 --- a/test cases/frameworks/9 wxwidgets/meson.build +++ b/test cases/frameworks/9 wxwidgets/meson.build @@ -2,7 +2,7 @@ project('wxwidgets test', 'cpp') add_global_arguments('-std=c++11', language : 'cpp') -wxd = dependency('wxwidgets') +wxd = dependency('wxwidgets', version : '>=3.0.0') wp = executable('wxprog', 'wxprog.cpp', dependencies : wxd) |