Pull in GTest as a dependency of GMock

* WrapDB already unconditionally includes GTest,
  and using GMock without GTest is extremely hard
  and definitely not the default setup.
pull/4114/head
David Seifert 6 years ago
parent 5242241f5e
commit c427f8cc9c
No known key found for this signature in database
GPG Key ID: CE36E117202E3842
  1. 32
      mesonbuild/dependencies/dev.py

@ -104,17 +104,33 @@ class GMockDependency(ExternalDependency):
super().__init__('gmock', environment, 'cpp', kwargs)
self.main = kwargs.get('main', False)
# If we are getting main() from GMock, we definitely
# want to avoid linking in main() from GTest
gtest_kwargs = kwargs.copy()
if self.main:
gtest_kwargs['main'] = False
# GMock without GTest is pretty much useless
# this also mimics the structure given in WrapDB,
# where GMock always pulls in GTest
gtest_dep = GTestDependency(environment, gtest_kwargs)
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
# GMock may be a library or just source.
# Work with both.
gmock_detect = self.clib_compiler.find_library("gmock", self.env, [])
gmock_main_detect = self.clib_compiler.find_library("gmock_main", self.env, [])
if gmock_detect and (not self.main or gmock_main_detect):
self.is_found = True
self.compile_args = []
self.link_args = gmock_detect
self.link_args += gmock_detect
if self.main:
self.link_args += gmock_main_detect
self.sources = []
self.prebuilt = True
return
@ -124,19 +140,21 @@ class GMockDependency(ExternalDependency):
# Yes, we need both because there are multiple
# versions of gmock that do different things.
d2 = os.path.normpath(os.path.join(d, '..'))
self.compile_args = ['-I' + d, '-I' + d2, '-I' + os.path.join(d2, 'include')]
self.link_args = []
self.compile_args += ['-I' + d, '-I' + d2, '-I' + os.path.join(d2, 'include')]
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 self.main:
self.sources = [all_src, main_src]
self.sources += [all_src, main_src]
else:
self.sources = [all_src]
self.sources += [all_src]
self.prebuilt = False
return
self.is_found = False
def need_threads(self):
return True
def log_info(self):
if self.prebuilt:
return 'prebuilt'

Loading…
Cancel
Save