From e75b7cdc158b9153d1791d0b2acce01f19c40f23 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Wed, 15 Aug 2018 18:29:05 +0100 Subject: Fix a misplaced bracket in GLDependency constructor This is a typo in 82bdf07a --- mesonbuild/dependencies/ui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesonbuild/dependencies/ui.py') diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index c877f51..34c9fb2 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -63,7 +63,7 @@ class GLDependency(ExternalDependency): candidates.append(functools.partial(PkgConfigDependency, 'gl', environment, kwargs)) if DependencyMethods.SYSTEM in methods: - candidates.append(functools.partial(GLDependency), environment, kwargs) + candidates.append(functools.partial(GLDependency, environment, kwargs)) return candidates -- cgit v1.1 From 6a4c2d63d7aa69b85581f4c4988a89bfb9c58014 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Wed, 15 Aug 2018 00:18:51 +0100 Subject: 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) --- mesonbuild/dependencies/ui.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'mesonbuild/dependencies/ui.py') 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 -- cgit v1.1