diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-08-15 00:18:51 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-08-26 17:23:39 +0100 |
| commit | 6a4c2d63d7aa69b85581f4c4988a89bfb9c58014 (patch) | |
| tree | b50345514f66eae02c6dbaab8489b1a8b36abf9c /mesonbuild/dependencies/ui.py | |
| parent | 1ffb44fa01bfbec2ecfedce44383b179994f3e69 (diff) | |
| download | meson-6a4c2d63d7aa69b85581f4c4988a89bfb9c58014.zip meson-6a4c2d63d7aa69b85581f4c4988a89bfb9c58014.tar.gz meson-6a4c2d63d7aa69b85581f4c4988a89bfb9c58014.tar.bz2 | |
Comparison with an unknown dependency version should always fail
Consistently use None to store an unknown dependency version (rather than
'none', 'unknown' or some made up version)
Diffstat (limited to 'mesonbuild/dependencies/ui.py')
| -rw-r--r-- | mesonbuild/dependencies/ui.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index 34c9fb2..f19a76d 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -44,14 +44,12 @@ class GLDependency(ExternalDependency): # FIXME: Use AppleFrameworks dependency self.link_args = ['-framework', 'OpenGL'] # FIXME: Detect version using self.clib_compiler - self.version = '1' return if mesonlib.is_windows(): self.is_found = True # FIXME: Use self.clib_compiler.find_library() self.link_args = ['-lopengl32'] # FIXME: Detect version using self.clib_compiler - self.version = '1' return @classmethod @@ -224,7 +222,7 @@ class QtBaseDependency(ExternalDependency): self.compile_args = [] self.link_args = [] self.from_text = mlog.format_list(methods) - self.version = 'none' + self.version = None def compilers_detect(self): "Detect Qt (4 or 5) moc, uic, rcc in the specified bindir or in PATH" @@ -557,7 +555,6 @@ class VulkanDependency(ExternalDependency): # TODO: find a way to retrieve the version from the sdk? # Usually it is a part of the path to it (but does not have to be) - self.version = '1' return else: # simply try to guess it, usually works on linux @@ -565,7 +562,6 @@ class VulkanDependency(ExternalDependency): if libs is not None and self.clib_compiler.has_header('vulkan/vulkan.h', '', environment): self.type_name = 'system' self.is_found = True - self.version = 1 # TODO for lib in libs: self.link_args.append(lib) return |