summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2015-01-28 19:45:25 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2015-01-28 19:46:24 +0000
commit7e94c1db6ba2f9a7ac28ceef02ba1d5c1bb28f30 (patch)
tree8f3c3a3690ef8145cf2fe32e6f22e14c4b6918a3
parentRemove unused modules stack (diff)
downloadslicer-7e94c1db6ba2f9a7ac28ceef02ba1d5c1bb28f30.tar.bz2
slicer-7e94c1db6ba2f9a7ac28ceef02ba1d5c1bb28f30.tar.xz
slicer-7e94c1db6ba2f9a7ac28ceef02ba1d5c1bb28f30.zip
Pass include dirs to slice tools
-rw-r--r--slice.jam46
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 ;