From 243da3993c138d33063f633aa3996a8a710ea396 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 15 Jul 2015 14:44:15 +0200
Subject: Implement project-qualified names/prerequisites, two-stage import

---
 build/algorithm.ixx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'build/algorithm.ixx')

diff --git a/build/algorithm.ixx b/build/algorithm.ixx
index c4f5815..a1e2129 100644
--- a/build/algorithm.ixx
+++ b/build/algorithm.ixx
@@ -4,6 +4,7 @@
 
 #include <utility> // pair
 
+#include <build/rule>
 #include <build/prerequisite>
 #include <build/context>
 
@@ -22,7 +23,8 @@ namespace build
   search (const target_type& t, const prerequisite_key& k)
   {
     return search (
-      prerequisite_key {{&t, k.tk.dir, k.tk.name, k.tk.ext}, k.scope});
+      prerequisite_key
+        {k.proj, {&t, k.tk.dir, k.tk.name, k.tk.ext}, k.scope});
   }
 
   inline target&
@@ -32,7 +34,10 @@ namespace build
           const std::string* ext,
           scope* scope)
   {
-    return search (prerequisite_key {{&type, &dir, &name, &ext}, scope});
+    const std::string* proj (nullptr);
+    return search (
+      prerequisite_key
+        {&proj, {&type, &dir, &name, &ext}, scope});
   }
 
   template <typename T>
-- 
cgit v1.1