aboutsummaryrefslogtreecommitdiff
path: root/dependencies.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2013-06-17 01:41:17 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2013-06-17 01:41:17 +0300
commitea3e8f1dd2bdefbab14c380eec0ed52b0252a8e8 (patch)
tree125e81684e7ab0311d927378eeecc5ff555c5cef /dependencies.py
parentce4f2f1bbe15d9a475c1891ccaed06a18424fdfc (diff)
downloadmeson-ea3e8f1dd2bdefbab14c380eec0ed52b0252a8e8.zip
meson-ea3e8f1dd2bdefbab14c380eec0ed52b0252a8e8.tar.gz
meson-ea3e8f1dd2bdefbab14c380eec0ed52b0252a8e8.tar.bz2
Improvements to GTest and GMock.
Diffstat (limited to 'dependencies.py')
-rw-r--r--dependencies.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/dependencies.py b/dependencies.py
index b92935b..3672250 100644
--- a/dependencies.py
+++ b/dependencies.py
@@ -265,6 +265,10 @@ class GTestDependency(Dependency):
print('Dependency GTest found: YES')
else:
print('Dependency GTest found: NO')
+ if kwargs.get('main', False):
+ self.sources = [self.all_src, self.main_src]
+ else:
+ self.sources = [self.all_src]
def found(self):
return os.path.exists(self.all_src)
@@ -281,7 +285,7 @@ class GTestDependency(Dependency):
def get_version(self):
return '1.something_maybe'
def get_sources(self):
- return [self.all_src, self.main_src]
+ return self.sources
class GMockDependency(Dependency):
def __init__(self, kwargs):
@@ -306,8 +310,12 @@ class GMockDependency(Dependency):
self.is_found = True
self.compile_flags = ['-I' + self.src_include_dir]
self.link_flags = []
- self.sources = [self.all_src]
+ if kwargs.get('main', False):
+ self.sources = [self.all_src, self.main_src]
+ else:
+ self.sources = [self.all_src]
print('Dependency GMock found: YES')
+
else:
print('Dependency GMock found: NO')
self.is_found = False