aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies/misc.py
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2018-08-15 00:18:51 +0100
committerJon Turney <jon.turney@dronecode.org.uk>2018-08-26 17:23:39 +0100
commit6a4c2d63d7aa69b85581f4c4988a89bfb9c58014 (patch)
treeb50345514f66eae02c6dbaab8489b1a8b36abf9c /mesonbuild/dependencies/misc.py
parent1ffb44fa01bfbec2ecfedce44383b179994f3e69 (diff)
downloadmeson-6a4c2d63d7aa69b85581f4c4988a89bfb9c58014.zip
meson-6a4c2d63d7aa69b85581f4c4988a89bfb9c58014.tar.gz
meson-6a4c2d63d7aa69b85581f4c4988a89bfb9c58014.tar.bz2
Comparison with an unknown dependency version should always fail
Consistently use None to store an unknown dependency version (rather than 'none', 'unknown' or some made up version)
Diffstat (limited to 'mesonbuild/dependencies/misc.py')
-rw-r--r--mesonbuild/dependencies/misc.py11
1 files changed, 4 insertions, 7 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py
index 72bda52..014be84 100644
--- a/mesonbuild/dependencies/misc.py
+++ b/mesonbuild/dependencies/misc.py
@@ -180,7 +180,7 @@ class MPIDependency(ExternalDependency):
if version:
version = version.group(0)
else:
- version = 'none'
+ version = None
return version, cargs, libs
@@ -197,7 +197,7 @@ class MPIDependency(ExternalDependency):
return
args = shlex.split(o)
- version = 'none'
+ version = None
return version, args, args
@@ -222,11 +222,11 @@ class MPIDependency(ExternalDependency):
else:
return
if self.language == 'fortran':
- return ('none',
+ return (None,
['-I' + incdir, '-I' + os.path.join(incdir, post)],
[os.path.join(libdir, 'msmpi.lib'), os.path.join(libdir, 'msmpifec.lib')])
else:
- return ('none',
+ return (None,
['-I' + incdir, '-I' + os.path.join(incdir, post)],
[os.path.join(libdir, 'msmpi.lib')])
@@ -274,9 +274,6 @@ class ThreadDependency(ExternalDependency):
def need_threads(self):
return True
- def get_version(self):
- return 'unknown'
-
class Python3Dependency(ExternalDependency):
def __init__(self, environment, kwargs):