diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-04-30 09:33:11 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-05-02 13:28:33 -0700 |
| commit | b59bec08a2a8edf9442dcf4bbf2ce6bc736d7dc0 (patch) | |
| tree | 9875edb047866abcda9a8a9207e40d6e89b78a79 | |
| parent | 0654b1a2b160bd66f28991b67c16a43167a4b464 (diff) | |
| download | meson-b59bec08a2a8edf9442dcf4bbf2ce6bc736d7dc0.zip meson-b59bec08a2a8edf9442dcf4bbf2ce6bc736d7dc0.tar.gz meson-b59bec08a2a8edf9442dcf4bbf2ce6bc736d7dc0.tar.bz2 | |
dependencies: Use the _add_sub_dependency
| -rw-r--r-- | mesonbuild/dependencies/boost.py | 2 | ||||
| -rw-r--r-- | mesonbuild/dependencies/dev.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py index 381824c..46a479e 100644 --- a/mesonbuild/dependencies/boost.py +++ b/mesonbuild/dependencies/boost.py @@ -105,7 +105,7 @@ class BoostDependency(ExternalDependency): self.requested_modules = self.get_requested(kwargs) if 'thread' in self.requested_modules: - self.ext_deps.append(ThreadDependency(environment, kwargs)) + self._add_sub_dependency(ThreadDependency, environment, kwargs) self.boost_root = None self.boost_roots = [] diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py index c911cfa..5ee85bf 100644 --- a/mesonbuild/dependencies/dev.py +++ b/mesonbuild/dependencies/dev.py @@ -46,7 +46,7 @@ class GTestDependency(ExternalDependency): self.main = kwargs.get('main', False) self.src_dirs = ['/usr/src/gtest/src', '/usr/src/googletest/googletest/src'] self.detect() - self.ext_deps.append(ThreadDependency(environment, kwargs)) + self._add_sub_dependency(ThreadDependency, environment, kwargs) def detect(self): gtest_detect = self.clib_compiler.find_library("gtest", self.env, []) @@ -117,7 +117,7 @@ class GMockDependency(ExternalDependency): def __init__(self, environment, kwargs): super().__init__('gmock', environment, 'cpp', kwargs) self.main = kwargs.get('main', False) - self.ext_deps.append(ThreadDependency(environment, kwargs)) + self._add_sub_dependency(ThreadDependency, environment, kwargs) # If we are getting main() from GMock, we definitely # want to avoid linking in main() from GTest @@ -256,7 +256,7 @@ class LLVMDependency(ConfigToolDependency): self._set_old_link_args() self.link_args = strip_system_libdirs(environment, self.link_args) self.link_args = self.__fix_bogus_link_args(self.link_args) - self.ext_deps.append(ThreadDependency(environment, kwargs)) + self._add_sub_dependency(ThreadDependency, environment, kwargs) @staticmethod def __fix_bogus_link_args(args): |