diff --git a/mesonbuild/dependencies/__init__.py b/mesonbuild/dependencies/__init__.py index 4393ed6ef..14b7cba06 100644 --- a/mesonbuild/dependencies/__init__.py +++ b/mesonbuild/dependencies/__init__.py @@ -27,7 +27,7 @@ from .scalapack import ScalapackDependency from .misc import (BlocksDependency, CursesDependency, NetCDFDependency, OpenMPDependency, Python3Dependency, ThreadDependency, PcapDependency, CupsDependency, LibWmfDependency, LibGCryptDependency, GpgmeDependency, ShadercDependency) from .platform import AppleFrameworks -from .ui import GLDependency, GnuStepDependency, Qt4Dependency, Qt5Dependency, SDL2Dependency, WxDependency, VulkanDependency +from .ui import GLDependency, GnuStepDependency, Qt4Dependency, Qt5Dependency, SDL2Dependency, WxDependency, vulkan_factory packages.update({ @@ -70,7 +70,7 @@ packages.update({ 'qt5': Qt5Dependency, 'sdl2': SDL2Dependency, 'wxwidgets': WxDependency, - 'vulkan': VulkanDependency, + 'vulkan': vulkan_factory, }) _packages_accept_language.update({ 'hdf5', diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py index 38c51b88d..016e324db 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -31,7 +31,7 @@ from ..environment import detect_cpu_family from .base import DependencyException, DependencyMethods from .base import ExternalDependency, ExternalProgram, NonExistingExternalProgram from .base import ExtraFrameworkDependency, PkgConfigDependency -from .base import ConfigToolDependency, process_method_kw +from .base import ConfigToolDependency, process_method_kw, DependencyFactory class GLDependency(ExternalDependency): @@ -589,10 +589,10 @@ class WxDependency(ConfigToolDependency): return candidates -class VulkanDependency(ExternalDependency): +class VulkanDependencySystem(ExternalDependency): - def __init__(self, environment, kwargs): - super().__init__('vulkan', environment, kwargs) + def __init__(self, name: str, environment, kwargs, language: T.Optional[str] = None): + super().__init__(name, environment, kwargs, language=language) try: self.vulkan_sdk = os.environ['VULKAN_SDK'] @@ -645,22 +645,16 @@ class VulkanDependency(ExternalDependency): self.link_args.append(lib) return - @classmethod - def _factory(cls, environment, kwargs): - methods = process_method_kw(cls.get_methods(), kwargs) - candidates = [] - - if DependencyMethods.PKGCONFIG in methods: - candidates.append(functools.partial(PkgConfigDependency, 'vulkan', environment, kwargs)) - - if DependencyMethods.SYSTEM in methods: - candidates.append(functools.partial(VulkanDependency, environment, kwargs)) - - return candidates - @staticmethod def get_methods(): - return [DependencyMethods.PKGCONFIG, DependencyMethods.SYSTEM] + return [DependencyMethods.SYSTEM] def log_tried(self): return 'system' + + +vulkan_factory = DependencyFactory( + 'vulkan', + [DependencyMethods.PKGCONFIG, DependencyMethods.SYSTEM], + system_class=VulkanDependencySystem, +)