diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2015-12-02 11:37:15 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2015-12-02 11:37:15 +0200 |
commit | 9891b20350021ce41a950645dd76df20a45c92cc (patch) | |
tree | 0cd27041b0c3413e17b9319ae99e87c5e745b1ff /build/target.cxx | |
parent | 74212589a797ca75e55f92a522e198915c0dbaf6 (diff) |
Implement optional module loading
The syntax is:
using? cli
Now each module use results in two bool variables: <module>.loaded and
<module>.configured.
Also implement variable visibility (the above two variables are limited
to project).
Diffstat (limited to 'build/target.cxx')
-rw-r--r-- | build/target.cxx | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/build/target.cxx b/build/target.cxx index 85eec66..5c31311 100644 --- a/build/target.cxx +++ b/build/target.cxx @@ -133,7 +133,7 @@ namespace build // We cannot simply delegate to scope's lookup() since we also need // to check the group. // - for (const scope* s (&base_scope ()); s != nullptr; s = s->parent_scope ()) + for (const scope* s (&base_scope ()); s != nullptr; ) { if (!s->target_vars.empty ()) { @@ -149,6 +149,19 @@ namespace build if (auto r = s->vars.find (var)) return result (r, &s->vars); + + switch (var.visibility) + { + case variable_visibility::scope: + s = nullptr; + break; + case variable_visibility::project: + s = s->root () ? nullptr : s->parent_scope (); + break; + case variable_visibility::normal: + s = s->parent_scope (); + break; + } } return result (); |