diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-06-17 01:41:17 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-06-17 01:41:17 +0300 |
| commit | ea3e8f1dd2bdefbab14c380eec0ed52b0252a8e8 (patch) | |
| tree | 125e81684e7ab0311d927378eeecc5ff555c5cef | |
| parent | ce4f2f1bbe15d9a475c1891ccaed06a18424fdfc (diff) | |
| download | meson-ea3e8f1dd2bdefbab14c380eec0ed52b0252a8e8.zip meson-ea3e8f1dd2bdefbab14c380eec0ed52b0252a8e8.tar.gz meson-ea3e8f1dd2bdefbab14c380eec0ed52b0252a8e8.tar.bz2 | |
Improvements to GTest and GMock.
| -rw-r--r-- | dependencies.py | 12 | ||||
| -rw-r--r-- | test cases/frameworks/2 gtest/meson.build | 2 | ||||
| -rw-r--r-- | test cases/frameworks/3 gmock/meson.build | 2 |
3 files changed, 12 insertions, 4 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 diff --git a/test cases/frameworks/2 gtest/meson.build b/test cases/frameworks/2 gtest/meson.build index b1a7563..9cb8a74 100644 --- a/test cases/frameworks/2 gtest/meson.build +++ b/test cases/frameworks/2 gtest/meson.build @@ -1,6 +1,6 @@ project('gtest', 'cpp') -gtest = dependency('gtest') +gtest = dependency('gtest', main : true) e = executable('testprog', 'test.cc', deps : gtest) test('gtest test', e) diff --git a/test cases/frameworks/3 gmock/meson.build b/test cases/frameworks/3 gmock/meson.build index 37867c9..188a14d 100644 --- a/test cases/frameworks/3 gmock/meson.build +++ b/test cases/frameworks/3 gmock/meson.build @@ -3,7 +3,7 @@ project('gmock test', 'cpp') # Using gmock without gtest is a pain so just # don't support that then. -gtest = dependency('gtest') +gtest = dependency('gtest', main : true) gmock = dependency('gmock') e = executable('gmocktest', 'gmocktest.cc', deps : [gtest, gmock]) |