[cgma-dev] r2187 - in cgm/trunk: cgm_apps/examples/facetdriver test

[tautges at mcs.anl.gov]

Author: tautges
Date: 2008-10-30 18:47:26 -0500 (Thu, 30 Oct 2008)
New Revision: 2187

Modified:
   cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am
   cgm/trunk/test/Makefile.am
   cgm/trunk/test/sheet.cpp
Log:
Changes so that 'make check' will run with cgm-on-cubit.  Don't know if cgm-on-acis will run though.



Modified: cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am
===================================================================
--- cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am	2008-10-29 21:16:10 UTC (rev 2186)
+++ cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am	2008-10-30 23:47:26 UTC (rev 2187)
@@ -1,4 +1,7 @@
-TESTS = facets_90
+# Override default defines with the ones we want from the configure script
+DEFS = $(TEMPLATE_DEFS_INCLUDED) $(LITTLE_ENDIAN) $(HAVE_ACIS_DEF) $(CUBIT_CGM)
+
+TESTS = facets
 EXTRA_DIST = README $(TESTS)
 
 check_PROGRAMS = facets

Modified: cgm/trunk/test/Makefile.am
===================================================================
--- cgm/trunk/test/Makefile.am	2008-10-29 21:16:10 UTC (rev 2186)
+++ cgm/trunk/test/Makefile.am	2008-10-30 23:47:26 UTC (rev 2187)
@@ -3,6 +3,7 @@
 DEFS = $(TEMPLATE_DEFS_INCLUDED) $(LITTLE_ENDIAN) $(HAVE_ACIS_DEF) $(CUBIT_CGM)
 INCLUDES = -I$(top_srcdir)/geom \
            -I$(top_srcdir)/util \
+           -I$(top_srcdir)/init \
            -I$(top_srcdir)/geom/ACIS \
            -I$(top_srcdir)/geom/virtual \
            -I$(top_srcdir)/geom/facet \

Modified: cgm/trunk/test/sheet.cpp
===================================================================
--- cgm/trunk/test/sheet.cpp	2008-10-29 21:16:10 UTC (rev 2186)
+++ cgm/trunk/test/sheet.cpp	2008-10-30 23:47:26 UTC (rev 2187)
@@ -13,13 +13,14 @@
 #include "Body.hpp"
 #include "RefFace.hpp"
 #include "CubitObserver.hpp"
+#include "InitCGMA.hpp"
 
 #include <typeinfo>
 #include <assert.h>
 
 #ifdef HAVE_ACIS
-#include "AcisModifyEngine.hpp"
-#include "AcisQueryEngine.hpp"
+//#include "AcisModifyEngine.hpp"
+//#include "AcisQueryEngine.hpp"
 #endif
 
 #ifdef HAVE_OCC
@@ -32,15 +33,15 @@
 // main program - initialize, then send to proper function
 int main (int argc, char **argv)
 {
-  CubitObserver::init_static_observers();
-  CGMApp::instance()->startup( argc, argv );
-
+  CubitStatus result = InitCGMA::initialize_cgma();
+  if (CUBIT_SUCCESS != result) return 1;
+  
   GeometryQueryEngine* const gqe_list[] = {
 #ifdef HAVE_ACIS
-    AcisQueryEngine::instance(),
+//    AcisQueryEngine::instance(),
 #endif
 #ifdef HAVE_OCC
-    OCCQueryEngine::instance(),
+//    OCCQueryEngine::instance(),
 #endif
     NULL
   };
@@ -48,10 +49,10 @@
 
   GeometryModifyEngine* const gme_list[] = {
 #ifdef HAVE_ACIS
-    AcisModifyEngine::instance(),
+//    AcisModifyEngine::instance(),
 #endif
 #ifdef HAVE_OCC
-    OCCModifyEngine::instance(),
+//    OCCModifyEngine::instance(),
 #endif
     NULL
   };
@@ -66,8 +67,8 @@
 
 int test_sheet_query( GeometryModifyEngine* engine )
 {
-  CubitStatus rval = GeometryModifyTool::instance()->set_default_gme( engine );
-  assert(rval);
+//  CubitStatus rval = GeometryModifyTool::instance()->set_default_gme( engine );
+//  assert(rval);
   
   Body *sphere = 0, *sheet = 0;