aboutsummaryrefslogtreecommitdiff
path: root/dependencies.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-04-25 18:23:46 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2015-04-25 18:23:46 +0300
commit8cecf20404143eebf752379d97f7488afe2fd2a6 (patch)
tree465a6b374615a449b7e5eb8b7bfe5330da49b19d /dependencies.py
parent1f602ff1551c78229e005861bfb8571da61db02a (diff)
downloadmeson-8cecf20404143eebf752379d97f7488afe2fd2a6.zip
meson-8cecf20404143eebf752379d97f7488afe2fd2a6.tar.gz
meson-8cecf20404143eebf752379d97f7488afe2fd2a6.tar.bz2
Create file objects in gtest and gmock.
Diffstat (limited to 'dependencies.py')
-rw-r--r--dependencies.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/dependencies.py b/dependencies.py
index 9d0f3da..a9029bf 100644
--- a/dependencies.py
+++ b/dependencies.py
@@ -444,8 +444,8 @@ class GTestDependency(Dependency):
self.include_dir = '/usr/include'
self.src_include_dir = '/usr/src/gtest'
self.src_dir = '/usr/src/gtest/src'
- self.all_src = os.path.join(self.src_dir, 'gtest-all.cc')
- self.main_src = os.path.join(self.src_dir, 'gtest_main.cc')
+ self.all_src = mesonlib.File.from_absolute_file(os.path.join(self.src_dir, 'gtest-all.cc'))
+ self.main_src = mesonlib.File.from_absolute_file(os.path.join(self.src_dir, 'gtest_main.cc'))
self.detect()
def found(self):
@@ -526,8 +526,8 @@ class GMockDependency(Dependency):
# 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')
+ all_src = mesonlib.File.from_absolute_file(os.path.join(d, 'gmock-all.cc'))
+ main_src = mesonlib.File.from_absolute_file(os.path.join(d, 'gmock_main.cc'))
if kwargs.get('main', False):
self.sources = [all_src, main_src]
else: