Cache subprojects variable value in scope::root_extra

1 files changed, 11 insertions, 0 deletions

diff --git a/libbuild2/scope.hxx b/libbuild2/scope.hxx
index 48731dc..25657a3 100644
--- a/libbuild2/scope.hxx
+++ b/libbuild2/scope.hxx
@@ -27,6 +27,11 @@ namespace build2
 {
   class dir;
 
+  using subprojects = std::map<project_name, dir_path>;
+
+  LIBBUILD2_SYMEXPORT ostream&
+  operator<< (ostream&, const subprojects&); // Print as name@dir sequence.
+
   class LIBBUILD2_SYMEXPORT scope
   {
   public:
@@ -429,6 +434,12 @@ namespace build2
       //
       optional<const dir_path*> amalgamation;
 
+      // This project's subprojects (var_subprojects value). Absent means it
+      // is not yet determined (happens at the end of bootstrap_src()). NULL
+      // means there are no subprojects.
+      //
+      optional<const build2::subprojects*> subprojects;
+
       bool altn; // True if using alternative build file/directory naming.
 
       // Build file/directory naming scheme used by this project.