Pass include dirs to slice tools

1 files changed, 25 insertions, 21 deletions

diff --git a/slice.jam b/slice.jam
index 5c7fc83..9120a61 100644
--- a/slice.jam
+++ b/slice.jam
@@ -1,38 +1,42 @@
 import type : register ;
 import generators : register-standard ;
-import type ; 
-import feature : feature ; 
-import scanner ; 
+import type ;
+import feature : feature ;
+import scanner ;
+import toolset ;
 
-type.register SLICE : ice ; 
+type.register SLICE : ice ;
 
 feature slicer : no yes : propagated ;
 
 class slice-scanner : common-scanner
-{ 
-    rule pattern ( ) 
-    { 
-        return "^[ \t]*#[ \t]*include[ ]*[<\"]([^>\"]*)[>\"]" ; 
-    } 
-} 
+{
+    rule pattern ( )
+    {
+        return "^[ \t]*#[ \t]*include[ ]*[<\"]([^>\"]*)[>\"]" ;
+    }
+}
+
+scanner.register slice-scanner : include ;
 
-scanner.register slice-scanner : include ; 
+type.set-scanner SLICE : slice-scanner ;
 
-type.set-scanner SLICE : slice-scanner ; 
+generators.register-standard slice.slice2cpp : SLICE : CPP H : <slicer>no ;
+generators.register-standard slice.slicer : SLICE : CPP H : <slicer>yes ;
 
-generators.register-standard slice.slice2cpp : SLICE : CPP H : <slicer>no ; 
-generators.register-standard slice.slicer : SLICE : CPP H : <slicer>yes ; 
+toolset.flags slice.slice2cpp INCLUDES <include> ;
+toolset.flags slice.slicer INCLUDES <include> ;
 
-actions slice.slice2cpp 
-{ 
-  slice2cpp --checksum --output-dir $(1[1]:D) $(2) 
+actions slice.slice2cpp
+{
+  slice2cpp -I"$(INCLUDES)" --checksum --output-dir $(1[1]:D) $(2)
 }
 
-actions slice.slicer 
+actions slice.slicer
 {
-  slice2cpp --checksum --output-dir $(1[1]:D) $(2) 
-	slicer $(2) $(1[1])
-} 
+  slice2cpp -I"$(INCLUDES)" --checksum --output-dir $(1[1]:D) $(2)
+	slicer -I"$(INCLUDES)" $(2) $(1[1])
+}
 
 IMPORT $(__name__) : slice.slice2cpp : : slice.slice2cpp ;
 IMPORT $(__name__) : slice.slicer : : slice.slicer ;