[cgma-dev] r6045 - in cgm/trunk: geom/Cholla test util

[iulian at mcs.anl.gov]

Author: iulian
Date: 2013-05-23 12:51:42 -0500 (Thu, 23 May 2013)
New Revision: 6045

Modified:
   cgm/trunk/geom/Cholla/FacetorUtil.hpp
   cgm/trunk/geom/Cholla/Makefile.am
   cgm/trunk/test/Makefile.am
   cgm/trunk/util/Makefile.am
Log:
make distcheck should work now on a occ653 based build



Modified: cgm/trunk/geom/Cholla/FacetorUtil.hpp
===================================================================
--- cgm/trunk/geom/Cholla/FacetorUtil.hpp	2013-05-23 05:25:48 UTC (rev 6044)
+++ cgm/trunk/geom/Cholla/FacetorUtil.hpp	2013-05-23 17:51:42 UTC (rev 6045)
@@ -127,5 +127,5 @@
   static double radius(TRI* tri_ptr);  
 };
 
-#include "FacetorUtil.cpp"
+//#include "FacetorUtil.cpp"
 #endif

Modified: cgm/trunk/geom/Cholla/Makefile.am
===================================================================
--- cgm/trunk/geom/Cholla/Makefile.am	2013-05-23 05:25:48 UTC (rev 6044)
+++ cgm/trunk/geom/Cholla/Makefile.am	2013-05-23 17:51:42 UTC (rev 6045)
@@ -25,6 +25,7 @@
     ChollaPoint.cpp \
     ChollaSkinTool.cpp \
     ChollaSurface.cpp \
+    ChollaVolume.cpp \
     ChordalAxis.cpp \
     CubitFacet.cpp \
     CubitFacetData.cpp \
@@ -61,6 +62,7 @@
     ChollaPoint.hpp \
     ChollaSkinTool.hpp \
     ChollaSurface.hpp \
+    ChollaVolume.hpp \
     ChordalAxis.hpp \
     CubitFacet.hpp \
     CubitFacetData.hpp \
@@ -75,6 +77,7 @@
     FacetEntity.hpp \
     FacetEvalTool.hpp \
     FacetorTool.hpp \
+    FacetorUtil.hpp \
     GeoNode.hpp \
     GeoTet.hpp \
     LoopParamTool.hpp \

Modified: cgm/trunk/test/Makefile.am
===================================================================
--- cgm/trunk/test/Makefile.am	2013-05-23 05:25:48 UTC (rev 6044)
+++ cgm/trunk/test/Makefile.am	2013-05-23 17:51:42 UTC (rev 6045)
@@ -120,6 +120,7 @@
              Line_2.brep    \
              stitch.name_occ \
              box-w-hole.brep \
+             Solid_2.brep \
              Solid_6.brep  \