diff options
author | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-08-31 17:38:37 +0200 |
---|---|---|
committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-09-08 20:15:58 +0200 |
commit | 62f7642a6152ddaafbe8b5fd9eb7b19e8d87c079 (patch) | |
tree | 337ddc50cbd86e0697f5e8402da3395388e54012 /mesonbuild/dependencies/mpi.py | |
parent | b57a3554260262079de5f911fb5ff2be1bf71ce0 (diff) | |
download | meson-62f7642a6152ddaafbe8b5fd9eb7b19e8d87c079.zip meson-62f7642a6152ddaafbe8b5fd9eb7b19e8d87c079.tar.gz meson-62f7642a6152ddaafbe8b5fd9eb7b19e8d87c079.tar.bz2 |
typing: fix dependencies for new follow_imports
Diffstat (limited to 'mesonbuild/dependencies/mpi.py')
-rw-r--r-- | mesonbuild/dependencies/mpi.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/mpi.py b/mesonbuild/dependencies/mpi.py index deee9dd..2e1e764 100644 --- a/mesonbuild/dependencies/mpi.py +++ b/mesonbuild/dependencies/mpi.py @@ -24,10 +24,11 @@ from ..environment import detect_cpu_family if T.TYPE_CHECKING: from .base import Dependency from ..compilers import Compiler + from ..compilers.compiler import CompilerType from ..environment import Environment, MachineChoice -@factory_methods({DependencyMethods.PKGCONFIG, DependencyMethods.CONFIG_TOOL, DependencyMethods.SYSTEM}) # type: ignore +@factory_methods({DependencyMethods.PKGCONFIG, DependencyMethods.CONFIG_TOOL, DependencyMethods.SYSTEM}) def mpi_factory(env: 'Environment', for_machine: 'MachineChoice', kwargs: T.Dict[str, T.Any], methods: T.List[DependencyMethods]) -> T.List[T.Callable[[], 'Dependency']]: language = kwargs.get('language', 'c') @@ -36,7 +37,9 @@ def mpi_factory(env: 'Environment', for_machine: 'MachineChoice', return [] candidates = [] # type: T.List[T.Callable[[], Dependency]] - compiler = detect_compiler('mpi', env, for_machine, language) + compiler = detect_compiler('mpi', env, for_machine, language) # type: T.Optional['CompilerType'] + if compiler is None: + return [] compiler_is_intel = compiler.get_id() in {'intel', 'intel-cl'} # Only OpenMPI has pkg-config, and it doesn't work with the intel compilers |