diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-04-05 16:19:30 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-04-05 16:19:30 -0700 |
| commit | b842b0b04aa8678f98cbec5f7022e75636ddf4a3 (patch) | |
| tree | 3ac5406cc9ee1ea4752e87116f340f489f7b8573 | |
| parent | b1aa54bb2911ecf0f26391a9b1e0a6cd308913b5 (diff) | |
| download | meson-b842b0b04aa8678f98cbec5f7022e75636ddf4a3.tar.gz | |
dependencies: Add ext_deps to all dependencies
I'll be using this later, but it seems useful to allow dependencies to
that have special handlers to declare that they depend on other
dependencies. This should allow us to stop treating threads special
internally and just make it a normal dependency.
| -rw-r--r-- | mesonbuild/build.py | 1 | ||||
| -rw-r--r-- | mesonbuild/dependencies/base.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index bcd1754e6..020c47b58 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -1035,6 +1035,7 @@ This will become a hard error in a future Meson release.''') if dep not in self.external_deps: self.external_deps.append(dep) self.process_sourcelist(dep.get_sources()) + self.add_deps(dep.ext_deps) elif isinstance(dep, BuildTarget): raise InvalidArguments('''Tried to use a build target as a dependency. You probably should put it in link_with instead.''') diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index af4b13fad..032fe60a6 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -115,6 +115,7 @@ class Dependency: self.raw_link_args = None self.sources = [] self.methods = self._process_method_kw(kwargs) + self.ext_deps = [] # type: List[Dependency] def __repr__(self): s = '<{0} {1}: {2}>' |
