diff options
author | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-12-16 13:20:01 -0500 |
---|---|---|
committer | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-12-19 11:52:32 -0500 |
commit | f1d370247fc3a46a5232ea2356ea6d67e5950e0f (patch) | |
tree | b6c53f8c1d22fc754a831a896a8648110ec81016 /mesonbuild/dependencies/scalapack.py | |
parent | 06821755d253a930ebe29bb27f55b442c1790fed (diff) | |
download | meson-f1d370247fc3a46a5232ea2356ea6d67e5950e0f.zip meson-f1d370247fc3a46a5232ea2356ea6d67e5950e0f.tar.gz meson-f1d370247fc3a46a5232ea2356ea6d67e5950e0f.tar.bz2 |
dependencies: refactor to use methods properly
Diffstat (limited to 'mesonbuild/dependencies/scalapack.py')
-rw-r--r-- | mesonbuild/dependencies/scalapack.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/dependencies/scalapack.py b/mesonbuild/dependencies/scalapack.py index 36bfd66..8a58402 100644 --- a/mesonbuild/dependencies/scalapack.py +++ b/mesonbuild/dependencies/scalapack.py @@ -21,14 +21,14 @@ from .base import CMakeDependency, DependencyMethods, ExternalDependency, PkgCon class ScalapackDependency(ExternalDependency): def __init__(self, environment, kwargs: dict): - methods = mesonlib.listify(kwargs.get('method', 'auto')) super().__init__('scalapack', environment, None, kwargs) kwargs['required'] = False kwargs['silent'] = True self.is_found = False self.static = kwargs.get('static', False) + methods = mesonlib.listify(self.methods) - if set(methods).intersection(['auto', 'pkg-config']): + if set([DependencyMethods.AUTO, DependencyMethods.PKGCONFIG]).intersection(methods): pkgconfig_files = [] mklroot = None is_gcc = self.clib_compiler.get_id() == 'gcc' @@ -106,8 +106,8 @@ class ScalapackDependency(ExternalDependency): self.pcdep = pkgdep return - if set(methods).intersection(['auto', 'cmake']): - cmakedep = CMakeDependency('Scalapack', environment, kwargs) + if set([DependencyMethods.AUTO, DependencyMethods.CMAKE]).intersection(methods): + cmakedep = CMakeDependency('Scalapack', environment, kwargs, language=self.language) if cmakedep.found(): self.compile_args = cmakedep.get_compile_args() self.link_args = cmakedep.get_link_args() |