aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies/dev.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2018-08-27 21:29:57 +0300
committerGitHub <noreply@github.com>2018-08-27 21:29:57 +0300
commit899b0aae9f9afacccfd5963e84df6634e9835b5c (patch)
tree41d7575d4d7c9a825715cd1243de4a129aea933a /mesonbuild/dependencies/dev.py
parentac07ae7d41e82663c955363e5124404fe9410262 (diff)
parent7fff8318f537400249f191eda373c716e5ba2bee (diff)
downloadmeson-899b0aae9f9afacccfd5963e84df6634e9835b5c.zip
meson-899b0aae9f9afacccfd5963e84df6634e9835b5c.tar.gz
meson-899b0aae9f9afacccfd5963e84df6634e9835b5c.tar.bz2
Merge pull request #4035 from jon-turney/factor-out-version-check
Apply dependency(version:) check for all dependency types
Diffstat (limited to 'mesonbuild/dependencies/dev.py')
-rw-r--r--mesonbuild/dependencies/dev.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py
index 0cd3c2b..0876391 100644
--- a/mesonbuild/dependencies/dev.py
+++ b/mesonbuild/dependencies/dev.py
@@ -35,7 +35,6 @@ class GTestDependency(ExternalDependency):
self.detect()
def detect(self):
- self.version = '1.something_maybe'
gtest_detect = self.clib_compiler.find_library("gtest", self.env, [])
gtest_main_detect = self.clib_compiler.find_library("gtest_main", self.env, [])
if gtest_detect and (not self.main or gtest_main_detect):
@@ -85,7 +84,6 @@ class GTestDependency(ExternalDependency):
class GMockDependency(ExternalDependency):
def __init__(self, environment, kwargs):
super().__init__('gmock', environment, 'cpp', kwargs)
- self.version = '1.something_maybe'
# GMock may be a library or just source.
# Work with both.
gmock_detect = self.clib_compiler.find_library("gmock", self.env, [])