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/misc.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/misc.py')
-rw-r--r-- | mesonbuild/dependencies/misc.py | 45 |
1 files changed, 30 insertions, 15 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index d773eb7..7088697 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -39,26 +39,41 @@ class NetCDFDependency(ExternalDependency): kwargs['required'] = False kwargs['silent'] = True self.is_found = False - - pkgconfig_files = ['netcdf'] + methods = listify(self.methods) if language not in ('c', 'cpp', 'fortran'): raise DependencyException('Language {} is not supported with NetCDF.'.format(language)) - if language == 'fortran': - pkgconfig_files.append('netcdf-fortran') - - self.compile_args = [] - self.link_args = [] - self.pcdep = [] - for pkg in pkgconfig_files: - pkgdep = PkgConfigDependency(pkg, environment, kwargs, language=self.language) - if pkgdep.found(): - self.compile_args.extend(pkgdep.get_compile_args()) - self.link_args.extend(pkgdep.get_link_args()) - self.version = pkgdep.get_version() + if set([DependencyMethods.AUTO, DependencyMethods.PKGCONFIG]).intersection(methods): + pkgconfig_files = ['netcdf'] + + if language == 'fortran': + pkgconfig_files.append('netcdf-fortran') + + self.compile_args = [] + self.link_args = [] + self.pcdep = [] + for pkg in pkgconfig_files: + pkgdep = PkgConfigDependency(pkg, environment, kwargs, language=self.language) + if pkgdep.found(): + self.compile_args.extend(pkgdep.get_compile_args()) + self.link_args.extend(pkgdep.get_link_args()) + self.version = pkgdep.get_version() + self.is_found = True + self.pcdep.append(pkgdep) + + if set([DependencyMethods.AUTO, DependencyMethods.CMAKE]).intersection(methods): + cmakedep = CMakeDependency('NetCDF', environment, kwargs, language=self.language) + if cmakedep.found(): + self.compile_args = cmakedep.get_compile_args() + self.link_args = cmakedep.get_link_args() + self.version = cmakedep.get_version() self.is_found = True - self.pcdep.append(pkgdep) + return + + @staticmethod + def get_methods(): + return [DependencyMethods.AUTO, DependencyMethods.PKGCONFIG, DependencyMethods.CMAKE] class OpenMPDependency(ExternalDependency): |