WIP: add back the cmake_name parameter to DependencyFactory

Author: dcbaker

mesonbuild/dependencies/dev.py

@@ -17,7 +17,7 @@
 from .. import mesonlib, mlog
 from ..tooldetect import get_llvm_tool_names
 from ..mesonlib import version_compare, version_compare_many, search_version
-from .base import DependencyException, DependencyMethods, detect_compiler, strip_system_includedirs, strip_system_libdirs, SystemDependency, ExternalDependency, DependencyCandidate
+from .base import DependencyException, DependencyMethods, detect_compiler, strip_system_includedirs, strip_system_libdirs, SystemDependency, ExternalDependency
 from .cmake import CMakeDependency
 from .configtool import ConfigToolDependency
 from .detect import packages
@@ -823,6 +823,6 @@ def get_variable(self, *, cmake: T.Optional[str] = None, pkgconfig: T.Optional[s
 packages['zlib'] = zlib_factory = DependencyFactory(
     'zlib',
     [DependencyMethods.PKGCONFIG, DependencyMethods.CMAKE, DependencyMethods.SYSTEM],
-    cmake=DependencyCandidate.from_dependency('ZLIB', CMakeDependency),
+    cmake_name='ZLIB',
     system=ZlibSystemDependency,
 )

mesonbuild/dependencies/factory.py

@@ -58,7 +58,8 @@ class DependencyFactory:
     :param extra_kwargs: Additional keyword arguments to add when creating the
         DependencyCandidate
     :param pkgconfig: A custom PackageConfig lookup to use
-    :param cmake: A custom CMake lookup to use
+    :param cmake_name: A name to use in a cmake class. Exclusive with :param:`cmake`
+    :param cmake: A custom CMake lookup to use. Exclusive with :param:`cmake_name`
     :param framework: A custom AppleFramework lookup to use
     :param configtool: A custom ConfigTool lookup to use. If
         DependencyMethods.CONFIG_TOOL is in the `:param:methods` argument,
@@ -73,8 +74,9 @@ class DependencyFactory:
 
     def __init__(self, name: str, methods: T.List[DependencyMethods], *,
                  extra_kwargs: T.Optional[DependencyObjectKWs] = None,
+                 cmake_name: T.Optional[str] = None,
                  pkgconfig: T.Union[DependencyCandidate[PkgConfigDependency], T.Type[PkgConfigDependency], None] = PkgConfigDependency,
-                 cmake: T.Union[DependencyCandidate[CMakeDependency], T.Type[CMakeDependency], None] = CMakeDependency,
+                 cmake: T.Union[DependencyCandidate[CMakeDependency], T.Type[CMakeDependency], None] = None,
                  framework: T.Union[DependencyCandidate[ExtraFrameworkDependency], T.Type[ExtraFrameworkDependency], None] = ExtraFrameworkDependency,
                  configtool: T.Union[DependencyCandidate[ConfigToolDependency], T.Type[ConfigToolDependency], None] = None,
                  builtin: T.Union[DependencyCandidate[BuiltinDependency], T.Type[BuiltinDependency], None] = None,
@@ -87,6 +89,14 @@ def __init__(self, name: str, methods: T.List[DependencyMethods], *,
         if DependencyMethods.SYSTEM in methods and not system:
             raise DependencyException('A system dependency must have a custom class')
 
+        if cmake_name is not None and cmake is not None:
+            raise DependencyException('A most one of `cmake_name` and `cmake` can be provided')
+
+        if cmake_name is not None:
+            cmake = DependencyCandidate.from_dependency(cmake_name, CMakeDependency)
+        if cmake is None:
+            cmake = CMakeDependency
+
         def make(arg: T.Union[DependencyCandidate[DepType], T.Type[DepType], None]) -> T.Optional[DependencyCandidate[DepType]]:
             if arg is None or isinstance(arg, DependencyCandidate):
                 return arg

mesonbuild/dependencies/misc.py

@@ -605,7 +605,7 @@ def shaderc_factory(env: 'Environment',
     'cups',
     [DependencyMethods.PKGCONFIG, DependencyMethods.CONFIG_TOOL, DependencyMethods.EXTRAFRAMEWORK, DependencyMethods.CMAKE],
     configtool=CupsDependencyConfigTool,
-    cmake=DependencyCandidate.from_dependency('Cups', CMakeDependency),
+    cmake_name='Cups',
 )
 
 packages['dl'] = dl_factory = DependencyFactory(
@@ -643,7 +643,7 @@ def shaderc_factory(env: 'Environment',
 packages['threads'] = threads_factory = DependencyFactory(
     'threads',
     [DependencyMethods.SYSTEM, DependencyMethods.CMAKE],
-    cmake=DependencyCandidate.from_dependency('Threads', CMakeDependency),
+    cmake_name='Threads',
     system=ThreadDependency,
 )
 

mesonbuild/dependencies/ui.py

@@ -17,8 +17,7 @@
 )
 from ..envconfig import detect_cpu_family
 
-from .base import DependencyCandidate, DependencyException, DependencyMethods, DependencyTypeName, SystemDependency
-from .cmake import CMakeDependency
+from .base import DependencyException, DependencyMethods, DependencyTypeName, SystemDependency
 from .configtool import ConfigToolDependency
 from .detect import packages
 from .factory import DependencyFactory
@@ -260,7 +259,7 @@ def __init__(self, name: str, environment: 'Environment', kwargs: DependencyObje
     'sdl2',
     [DependencyMethods.PKGCONFIG, DependencyMethods.CONFIG_TOOL, DependencyMethods.EXTRAFRAMEWORK, DependencyMethods.CMAKE],
     configtool=SDL2DependencyConfigTool,
-    cmake=DependencyCandidate.from_dependency('SDL2', CMakeDependency),
+    cmake_name='SDL2',
 )
 
 packages['vulkan'] = vulkan_factory = DependencyFactory(