diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2016-09-24 14:37:49 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2016-09-24 14:37:49 +0100 |
| commit | a0982a4d63766282c2c3c013915523c0afd5b37c (patch) | |
| tree | ea0e3728151a7b8e717d5f89ae38dcb8a692ef87 | |
| parent | Allow control of --dll-export and --ice (diff) | |
| download | project2-1.2.7.tar.bz2 project2-1.2.7.tar.xz project2-1.2.7.zip | |
Slicer 1.4 compatibility fixproject2-1.2.7
| -rw-r--r-- | project2/ice/Jamfile.jam | 4 | ||||
| -rw-r--r-- | project2/ice/buildComms.cpp | 9 |
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; |