aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2018-01-14 14:04:45 +0000
committerJon Turney <jon.turney@dronecode.org.uk>2018-01-15 13:12:29 +0000
commit8efdcca93063fb224c53ae2d6f57b8dacf082456 (patch)
tree6e96ce7aad071c9d047478140447d68e228452fb
parentbd128bc30116a60be956454e871d9ea59cc1590a (diff)
downloadmeson-8efdcca93063fb224c53ae2d6f57b8dacf082456.zip
meson-8efdcca93063fb224c53ae2d6f57b8dacf082456.tar.gz
meson-8efdcca93063fb224c53ae2d6f57b8dacf082456.tar.bz2
Make Dependency.get_methods() a static method
Since this is only consulted while constructing the Dependency object, it's result doesn't depend on the instance (and it would make no sense if it did)
-rw-r--r--mesonbuild/dependencies/base.py9
-rw-r--r--mesonbuild/dependencies/misc.py12
-rw-r--r--mesonbuild/dependencies/ui.py12
3 files changed, 22 insertions, 11 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
index 01df9d0..fa50761 100644
--- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py
@@ -115,7 +115,8 @@ class Dependency:
As an example, gtest-all.cc when using GTest."""
return self.sources
- def get_methods(self):
+ @staticmethod
+ def get_methods():
return [DependencyMethods.AUTO]
def get_name(self):
@@ -308,7 +309,8 @@ class ConfigToolDependency(ExternalDependency):
return []
return shlex.split(out)
- def get_methods(self):
+ @staticmethod
+ def get_methods():
return [DependencyMethods.AUTO, DependencyMethods.CONFIG_TOOL]
def get_configtool_variable(self, variable_name):
@@ -535,7 +537,8 @@ class PkgConfigDependency(ExternalDependency):
mlog.debug('Got pkgconfig variable %s : %s' % (variable_name, variable))
return variable
- def get_methods(self):
+ @staticmethod
+ def get_methods():
return [DependencyMethods.PKGCONFIG]
def check_pkgconfig(self):
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py
index cf3b51b..e46fb84 100644
--- a/mesonbuild/dependencies/misc.py
+++ b/mesonbuild/dependencies/misc.py
@@ -792,7 +792,8 @@ class Python3Dependency(ExternalDependency):
self.version = sysconfig.get_config_var('py_version')
self.is_found = True
- def get_methods(self):
+ @staticmethod
+ def get_methods():
if mesonlib.is_windows():
return [DependencyMethods.PKGCONFIG, DependencyMethods.SYSCONFIG]
elif mesonlib.is_osx():
@@ -839,7 +840,8 @@ class PcapDependency(ExternalDependency):
except Exception as e:
mlog.debug('Pcap not found via pcap-config. Trying next, error was:', str(e))
- def get_methods(self):
+ @staticmethod
+ def get_methods():
if mesonlib.is_osx():
return [DependencyMethods.PKGCONFIG, DependencyMethods.CONFIG_TOOL, DependencyMethods.EXTRAFRAMEWORK]
else:
@@ -893,7 +895,8 @@ class CupsDependency(ExternalDependency):
return
mlog.log('Dependency', mlog.bold('cups'), 'found:', mlog.red('NO'))
- def get_methods(self):
+ @staticmethod
+ def get_methods():
if mesonlib.is_osx():
return [DependencyMethods.PKGCONFIG, DependencyMethods.CONFIG_TOOL, DependencyMethods.EXTRAFRAMEWORK]
else:
@@ -932,7 +935,8 @@ class LibWmfDependency(ExternalDependency):
except Exception as e:
mlog.debug('cups not found via libwmf-config. Trying next, error was:', str(e))
- def get_methods(self):
+ @staticmethod
+ def get_methods():
if mesonlib.is_osx():
return [DependencyMethods.PKGCONFIG, DependencyMethods.CONFIG_TOOL, DependencyMethods.EXTRAFRAMEWORK]
else:
diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
index c066c31..00cd56d 100644
--- a/mesonbuild/dependencies/ui.py
+++ b/mesonbuild/dependencies/ui.py
@@ -67,7 +67,8 @@ class GLDependency(ExternalDependency):
self.version = '1'
return
- def get_methods(self):
+ @staticmethod
+ def get_methods():
if mesonlib.is_osx() or mesonlib.is_windows():
return [DependencyMethods.PKGCONFIG, DependencyMethods.SYSTEM]
else:
@@ -337,7 +338,8 @@ class QtBaseDependency(ExternalDependency):
else:
return qvars['QT_INSTALL_BINS']
- def get_methods(self):
+ @staticmethod
+ def get_methods():
return [DependencyMethods.PKGCONFIG, DependencyMethods.QMAKE]
def get_exe_args(self, compiler):
@@ -420,7 +422,8 @@ class SDL2Dependency(ExternalDependency):
return
mlog.log('Dependency', mlog.bold('sdl2'), 'found:', mlog.red('NO'))
- def get_methods(self):
+ @staticmethod
+ def get_methods():
if mesonlib.is_osx():
return [DependencyMethods.PKGCONFIG, DependencyMethods.CONFIG_TOOL, DependencyMethods.EXTRAFRAMEWORK]
else:
@@ -526,5 +529,6 @@ class VulkanDependency(ExternalDependency):
self.link_args.append(lib)
return
- def get_methods(self):
+ @staticmethod
+ def get_methods():
return [DependencyMethods.PKGCONFIG, DependencyMethods.SYSTEM]