diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-08-27 21:29:57 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-27 21:29:57 +0300 |
| commit | 899b0aae9f9afacccfd5963e84df6634e9835b5c (patch) | |
| tree | 41d7575d4d7c9a825715cd1243de4a129aea933a /mesonbuild/interpreter.py | |
| parent | ac07ae7d41e82663c955363e5124404fe9410262 (diff) | |
| parent | 7fff8318f537400249f191eda373c716e5ba2bee (diff) | |
| download | meson-899b0aae9f9afacccfd5963e84df6634e9835b5c.zip meson-899b0aae9f9afacccfd5963e84df6634e9835b5c.tar.gz meson-899b0aae9f9afacccfd5963e84df6634e9835b5c.tar.bz2 | |
Merge pull request #4035 from jon-turney/factor-out-version-check
Apply dependency(version:) check for all dependency types
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 2 |
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)') |