Merge pull request #6355 from scivision/depmethod

dependencies: refactor {coarray,mpi,hdf5,netcdf} to use dependency(.., methods: ...)

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):