aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2018-08-16 14:33:04 +0100
committerJon Turney <jon.turney@dronecode.org.uk>2018-08-26 17:23:39 +0100
commit0f568cc8d5f8511790ca75188569f60c14f775b7 (patch)
tree47de75fd650648c327a8f522214e3f9b540ea170 /mesonbuild
parent6a4c2d63d7aa69b85581f4c4988a89bfb9c58014 (diff)
downloadmeson-0f568cc8d5f8511790ca75188569f60c14f775b7.zip
meson-0f568cc8d5f8511790ca75188569f60c14f775b7.tar.gz
meson-0f568cc8d5f8511790ca75188569f60c14f775b7.tar.bz2
Don't use version to check for a not-found fallback
In _find_cached_fallback_dep(), actually check if dependency is not found, rather than using a specific version as a proxy for that.
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/interpreter.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 04e963a..4fbb837 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -2822,7 +2822,7 @@ external dependencies (including libraries) must go to "dependencies".''')
return False
found = dep.version_method([], {})
# Don't do a version check if the dependency is not found and not required
- if found == 'none' and not required:
+ if not dep.found_method([], {}) and not required:
subproj_path = os.path.join(self.subproject_dir, dirname)
mlog.log('Dependency', mlog.bold(name), 'from subproject',
mlog.bold(subproj_path), 'found:', mlog.red('NO'), '(cached)')