aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-02-28 03:40:43 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2015-02-28 03:40:43 +0200
commitdb81b31070641771fac64cb081cb2aa457541deb (patch)
tree1d90d70ba148253853b924f7af94eced8758ceec
parente40eec4b85404238c8e46b1998903179d000a355 (diff)
downloadmeson-db81b31070641771fac64cb081cb2aa457541deb.zip
meson-db81b31070641771fac64cb081cb2aa457541deb.tar.gz
meson-db81b31070641771fac64cb081cb2aa457541deb.tar.bz2
Fix gmock when compiling from source on Debian derivatives.
-rw-r--r--dependencies.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/dependencies.py b/dependencies.py
index 1855916..2779240 100644
--- a/dependencies.py
+++ b/dependencies.py
@@ -508,7 +508,9 @@ class GMockDependency(Dependency):
for d in ['/usr/src/gmock/src', '/usr/src/gmock']:
if os.path.exists(d):
self.is_found = True
- self.compile_args = ['-I' + d]
+ # Yes, we need both because there are multiple
+ # versions of gmock that do different things.
+ self.compile_args = ['-I/usr/src/gmock', '-I/usr/src/gmock/src']
self.link_args = []
all_src = os.path.join(d, 'gmock-all.cc')
main_src = os.path.join(d, 'gmock_main.cc')