Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Create file objects in gtest and gmock.

This commit is contained in:
Jussi Pakkanen 2015-04-25 18:23:46 +03:00
parent 1f602ff155
commit 8cecf20404
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dependencies.py
View File

@ -444,8 +444,8 @@ class GTestDependency(Dependency):
self.include_dir = '/usr/include' self.include_dir = '/usr/include'
self.src_include_dir = '/usr/src/gtest' self.src_include_dir = '/usr/src/gtest'
self.src_dir = '/usr/src/gtest/src' self.src_dir = '/usr/src/gtest/src'
self.all_src = os.path.join(self.src_dir, 'gtest-all.cc') self.all_src = mesonlib.File.from_absolute_file(os.path.join(self.src_dir, 'gtest-all.cc'))
self.main_src = os.path.join(self.src_dir, 'gtest_main.cc') self.main_src = mesonlib.File.from_absolute_file(os.path.join(self.src_dir, 'gtest_main.cc'))
self.detect() self.detect()
def found(self): def found(self):
@ -526,8 +526,8 @@ class GMockDependency(Dependency):
# versions of gmock that do different things. # versions of gmock that do different things.
self.compile_args = ['-I/usr/src/gmock', '-I/usr/src/gmock/src'] self.compile_args = ['-I/usr/src/gmock', '-I/usr/src/gmock/src']
self.link_args = [] self.link_args = []
all_src = os.path.join(d, 'gmock-all.cc') all_src = mesonlib.File.from_absolute_file(os.path.join(d, 'gmock-all.cc'))
main_src = os.path.join(d, 'gmock_main.cc') main_src = mesonlib.File.from_absolute_file(os.path.join(d, 'gmock_main.cc'))
if kwargs.get('main', False): if kwargs.get('main', False):
self.sources = [all_src, main_src] self.sources = [all_src, main_src]
else: else:

6
mesonlib.py
View File

@ -35,7 +35,11 @@ class File:
@staticmethod @staticmethod
def from_built_file(subdir, fname): def from_built_file(subdir, fname):
return File(True, subdir, fname) return File(True, subdir, fname)
@staticmethod
def from_absolute_file(fname):
return File(False, '', fname)
def rel_to_builddir(self, build_to_src): def rel_to_builddir(self, build_to_src):
if self.is_built: if self.is_built:
return os.path.join(self.subdir, self.fname) return os.path.join(self.subdir, self.fname)