diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-04-05 16:42:44 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-04-05 16:42:44 -0700 |
| commit | 63090605a5c7f905491dccb663be8bca7d935489 (patch) | |
| tree | d102a04c79241f7a10dfd8622f0b3a8e4654ee2d /mesonbuild/dependencies/dev.py | |
| parent | 6ad7fbf9509dd68792df7df08b785967a067d4c4 (diff) | |
| download | meson-63090605a5c7f905491dccb663be8bca7d935489.zip meson-63090605a5c7f905491dccb663be8bca7d935489.tar.gz meson-63090605a5c7f905491dccb663be8bca7d935489.tar.bz2 | |
dependencies/dev: Use ext_deps for GTest in GMock
Rather than assigning the gtest variables to gmock, just set gtest as
a sub dependency.
Diffstat (limited to 'mesonbuild/dependencies/dev.py')
| -rw-r--r-- | mesonbuild/dependencies/dev.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index fb7b017..c911cfa 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -132,10 +132,7 @@ class GMockDependency(ExternalDependency): if not gtest_dep.is_found: self.is_found = False return - - self.compile_args = gtest_dep.compile_args - self.link_args = gtest_dep.link_args - self.sources = gtest_dep.sources + self.ext_deps.append(gtest_dep) # GMock may be a library or just source. # Work with both. |