diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2023-08-15 16:56:23 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2023-09-18 13:51:27 -0400 |
| commit | 30d7f506c7ffe4af52feab1a68263a4bd8d78c8a (patch) | |
| tree | 132587c0d6c69e4cb066ac8c862bf8e75703f25e /mesonbuild/dependencies/cmake.py | |
| parent | e0c4cffd70761c9b8176724145fb42d11e5313c4 (diff) | |
| download | meson-30d7f506c7ffe4af52feab1a68263a4bd8d78c8a.tar.gz | |
Remove get_pkgconfig_variable()
Make sure that pkgconfig_define is a pair of strings and not a list with
more than 2 strings.
Diffstat (limited to 'mesonbuild/dependencies/cmake.py')
| -rw-r--r-- | mesonbuild/dependencies/cmake.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/dependencies/cmake.py b/mesonbuild/dependencies/cmake.py index 2bb1f6b74..5263e5643 100644 --- a/mesonbuild/dependencies/cmake.py +++ b/mesonbuild/dependencies/cmake.py @@ -30,6 +30,7 @@ if T.TYPE_CHECKING: from ..cmake import CMakeTarget from ..environment import Environment from ..envconfig import MachineInfo + from ..interpreter.type_checking import PkgConfigDefineType class CMakeInfo(T.NamedTuple): module_paths: T.List[str] @@ -632,7 +633,7 @@ class CMakeDependency(ExternalDependency): def get_variable(self, *, cmake: T.Optional[str] = None, pkgconfig: T.Optional[str] = None, configtool: T.Optional[str] = None, internal: T.Optional[str] = None, default_value: T.Optional[str] = None, - pkgconfig_define: T.Optional[T.List[str]] = None) -> str: + pkgconfig_define: PkgConfigDefineType = None) -> str: if cmake and self.traceparser is not None: try: v = self.traceparser.vars[cmake] |
