aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/cmake/tracetargets.py
diff options
context:
space:
mode:
Diffstat (limited to 'mesonbuild/cmake/tracetargets.py')
-rw-r--r--mesonbuild/cmake/tracetargets.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/cmake/tracetargets.py b/mesonbuild/cmake/tracetargets.py
index 2169a6b..d64d1a1 100644
--- a/mesonbuild/cmake/tracetargets.py
+++ b/mesonbuild/cmake/tracetargets.py
@@ -12,6 +12,7 @@ if T.TYPE_CHECKING:
from .traceparser import CMakeTraceParser
from ..environment import Environment
from ..compilers import Compiler
+ from ..dependencies import MissingCompiler
class ResolvedTarget:
def __init__(self) -> None:
@@ -24,7 +25,7 @@ def resolve_cmake_trace_targets(target_name: str,
trace: 'CMakeTraceParser',
env: 'Environment',
*,
- clib_compiler: T.Optional['Compiler'] = None,
+ clib_compiler: T.Union['MissingCompiler', 'Compiler'] = None,
not_found_warning: T.Callable[[str], None] = lambda x: None) -> ResolvedTarget:
res = ResolvedTarget()
targets = [target_name]
@@ -48,7 +49,7 @@ def resolve_cmake_trace_targets(target_name: str,
res.libraries += [curr]
elif Path(curr).is_absolute() and Path(curr).exists():
res.libraries += [curr]
- elif env.machines.build.is_windows() and reg_is_maybe_bare_lib.match(curr) and clib_compiler is not None:
+ elif env.machines.build.is_windows() and reg_is_maybe_bare_lib.match(curr) and clib_compiler:
# On Windows, CMake library dependencies can be passed as bare library names,
# CMake brute-forces a combination of prefix/suffix combinations to find the
# right library. Assume any bare argument passed which is not also a CMake