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/file.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/file.cxx')
| -rw-r--r-- | build/file.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/build/file.cxx b/build/file.cxx index 970957b..9595d8f 100644 --- a/build/file.cxx +++ b/build/file.cxx @@ -528,7 +528,7 @@ namespace build // the NULL value indicates that we found no subprojects. // { - const variable& var (variable_pool.find ("subprojects")); + const variable& var (var_pool.find ("subprojects")); auto rp (root.vars.assign(var)); // Set NULL by default. value& v (rp.first); @@ -794,8 +794,7 @@ namespace build if (out_root.empty ()) { const variable& var ( - variable_pool.find ("config.import." + project, - dir_path_type)); + var_pool.find ("config.import." + project, dir_path_type)); if (auto l = iroot[var]) { |