summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--project2/ice/Jamfile.jam4
-rw-r--r--project2/ice/buildComms.cpp9
2 files changed, 10 insertions, 3 deletions
diff --git a/project2/ice/Jamfile.jam b/project2/ice/Jamfile.jam
index c669980..5d398f4 100644
--- a/project2/ice/Jamfile.jam
+++ b/project2/ice/Jamfile.jam
@@ -10,7 +10,8 @@ lib IceBox ;
lib IceUtil ;
lib pthread ;
lib boost_filesystem ;
-lib slicer : : <name>slicer : : <include>/usr/include/slicer ;
+lib slicer : : : : <include>/usr/include/slicer ;
+lib slicer-compiler : : : : <include>/usr/include/slicer ;
build-project unittests ;
@@ -91,6 +92,7 @@ lib p2ice :
<library>Ice
<library>Slice
<library>slicer
+ <library>slicer-compiler
<library>IceUtil
<library>boost_filesystem
<library>pthread
diff --git a/project2/ice/buildComms.cpp b/project2/ice/buildComms.cpp
index 49e58c8..0b3aa76 100644
--- a/project2/ice/buildComms.cpp
+++ b/project2/ice/buildComms.cpp
@@ -24,7 +24,9 @@ BuildComms::Count(const boost::filesystem::path & in) const
}
if (slicerParts) {
- components += Slicer::Slicer::Apply(in, NULL);
+ Slicer::Slicer s;
+ s.slicePath = in;
+ components += s.Execute();
}
return components;
@@ -48,7 +50,10 @@ BuildComms::Build(const boost::filesystem::path & in, const boost::filesystem::p
}
if (slicerParts) {
- components += Slicer::Slicer::Apply(in, out);
+ Slicer::Slicer s;
+ s.slicePath = in;
+ s.cppPath = out;
+ components += s.Execute();
}
return components;