diff options
| -rw-r--r-- | mesonbuild/interpreter.py | 2 | ||||
| -rw-r--r-- | test cases/linuxlike/5 dependency versions/meson.build | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 7acff53..e114ab2 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1644,7 +1644,7 @@ class Interpreter(): if 'version' in kwargs: wanted = kwargs['version'] found = cached_dep.get_version() - if not found or not mesonlib.version_compare(found, wanted): + if not cached_dep.found() or not mesonlib.version_compare(found, wanted): # Cached dep has the wrong version. Check if an external # dependency or a fallback dependency provides it. cached_dep = None diff --git a/test cases/linuxlike/5 dependency versions/meson.build b/test cases/linuxlike/5 dependency versions/meson.build index abe3ea6..a3ee335 100644 --- a/test cases/linuxlike/5 dependency versions/meson.build +++ b/test cases/linuxlike/5 dependency versions/meson.build @@ -9,6 +9,10 @@ assert(zlib.version() == zlibver.version(), 'zlib versions did not match!') zlibver = dependency('zlib', version : '<1.0', required : false) assert(zlibver.found() == false, 'zlib <1.0 should not be found!') +# Test https://github.com/mesonbuild/meson/pull/610 +dependency('somebrokenlib', version : '>=2.0', required : false) +dependency('somebrokenlib', version : '>=1.0', required : false) + # Find internal dependency without version somelibver = dependency('somelib', fallback : ['somelibnover', 'some_dep']) |