summaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies/cmake.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2024-12-06 12:58:39 -0800
committerDylan Baker <dylan@pnwbakers.com>2025-10-20 15:15:53 -0700
commitde770ed936b2dde6e1506feb2433e0f82ae2ff9f (patch)
tree7206d659b4bbc8e43f941eeecfa76c73f9c05d7d /mesonbuild/dependencies/cmake.py
parentfac054bf714faed90badcf7ef27cffec00374e0d (diff)
downloadmeson-de770ed936b2dde6e1506feb2433e0f82ae2ff9f.tar.gz
interpreter: port dependency optional_modules to typed_kwargs
Diffstat (limited to 'mesonbuild/dependencies/cmake.py')
-rw-r--r--mesonbuild/dependencies/cmake.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/cmake.py b/mesonbuild/dependencies/cmake.py
index 94a1b1d04..066bb2900 100644
--- a/mesonbuild/dependencies/cmake.py
+++ b/mesonbuild/dependencies/cmake.py
@@ -4,7 +4,7 @@
from __future__ import annotations
from .base import ExternalDependency, DependencyException, DependencyTypeName
-from ..mesonlib import is_windows, MesonException, PerMachine, stringlistify, extract_as_list, MachineChoice
+from ..mesonlib import is_windows, MesonException, PerMachine, MachineChoice
from ..cmake import CMakeExecutor, CMakeTraceParser, CMakeException, CMakeToolchain, CMakeExecScope, check_cmake_args, resolve_cmake_trace_targets, cmake_is_debug
from .. import mlog
import importlib.resources
@@ -125,7 +125,7 @@ class CMakeDependency(ExternalDependency):
package_version = kwargs.get('cmake_package_version', '')
components = [(x, True) for x in kwargs.get('components', [])]
modules = [(x, True) for x in kwargs.get('modules', [])]
- modules += [(x, False) for x in stringlistify(extract_as_list(kwargs, 'optional_modules'))] # type: ignore[arg-type]
+ modules += [(x, False) for x in kwargs.get('optional_modules', [])]
cm_path = [x if os.path.isabs(x) else os.path.join(environment.get_source_dir(), x) for x in kwargs.get('cmake_module_path', [])]
if cm_path:
cm_args.append('-DCMAKE_MODULE_PATH=' + ';'.join(cm_path))