[cgma-dev] r2198 - in cgm/trunk: . cgm_apps/examples/facetdriver init itaps test

tautges at mcs.anl.gov tautges at mcs.anl.gov
Mon Nov 3 09:57:27 CST 2008 

Author: tautges
Date: 2008-11-03 09:57:27 -0600 (Mon, 03 Nov 2008)
New Revision: 2198

Modified:
   cgm/trunk/Makefile.am
   cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am
   cgm/trunk/configure.in
   cgm/trunk/init/InitCGMA.cpp
   cgm/trunk/init/Makefile.am
   cgm/trunk/itaps/Makefile.am
   cgm/trunk/itaps/iGeom_CGMA.cc
   cgm/trunk/test/Makefile.am
Log:
- Included several $(HAVE_OCC)'s in DEFS in several subdirs (Jason, shouldn't we just do this at the highest level?)
- changed iGeom init code to check return values and to account for OCC (we should probably remove the OCC and ACIS-specific stuff here and have the default action be to initialize all engines...)
- moved AC_SUBST for CGM_EXT_* to later in the configure, after modification due to OCC stuff
- changed CGM_EXT_LINK to CGM_EXT_LIBS in Makefile.am



Modified: cgm/trunk/Makefile.am
===================================================================
--- cgm/trunk/Makefile.am	2008-11-03 15:36:31 UTC (rev 2197)
+++ cgm/trunk/Makefile.am	2008-11-03 15:57:27 UTC (rev 2198)
@@ -45,11 +45,10 @@
 
 
 
-libcgm_la_LIBADD = init/libcgma_init.la $(CORE_CGM_LIBS) $(CGM_EXT_LINK)
+libcgm_la_LIBADD = init/libcgma_init.la $(CORE_CGM_LIBS) $(CGM_EXT_LIBS) $(CUBIT_FILE)
 
 libcgm_la_SOURCES = 
 
-
 # By default, cmg.make will define these to $(srcdir).  We
 # want to override that during the INSTALL of the file so
 # that the correct values are set (e.g. if someone does 

Modified: cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am
===================================================================
--- cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am	2008-11-03 15:36:31 UTC (rev 2197)
+++ cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am	2008-11-03 15:57:27 UTC (rev 2198)
@@ -13,4 +13,4 @@
                -I$(top_srcdir)/geom/Cholla \
                -I$(top_srcdir)/geom/facet
 
-LDADD = ../../../libcgm.la
+LDADD = $(top_builddir)/libcgm.la

Modified: cgm/trunk/configure.in
===================================================================
--- cgm/trunk/configure.in	2008-11-03 15:36:31 UTC (rev 2197)
+++ cgm/trunk/configure.in	2008-11-03 15:57:27 UTC (rev 2198)
@@ -61,15 +61,6 @@
 AM_CONDITIONAL(INCLUDE_TEMPLATE_DEFS, test x$TEMPLATE_DEFS_INCLUDED != x)
 
 ################################################################################
-#                           Define variables for linking
-################################################################################
-AC_SUBST(CGM_EXT_LIBS)
-AC_SUBST(CGM_EXT_LDFLAGS)
-AC_SUBST(CGM_EXT_LTFLAGS)
-AC_SUBST(CGM_EXT_INCLUDE)
-
-
-################################################################################
 #                         Use Cubit shared libraries
 ################################################################################
 CUBIT_FILE=no
@@ -387,6 +378,14 @@
 AC_SUBST(CUBIT_OCC_LIB)
 AC_SUBST(HAVE_OCC_DEF)
 
+################################################################################
+#                           Define variables for linking
+################################################################################
+AC_SUBST(CGM_EXT_LIBS)
+AC_SUBST(CGM_EXT_LDFLAGS)
+AC_SUBST(CGM_EXT_LTFLAGS)
+AC_SUBST(CGM_EXT_INCLUDE)
+
 # Allow "if WITH_OCC" in Makefile.am
 AM_CONDITIONAL( WITH_OCC, [test "x$occ_DIR" != "xno"] )
 

Modified: cgm/trunk/init/InitCGMA.cpp
===================================================================
--- cgm/trunk/init/InitCGMA.cpp	2008-11-03 15:36:31 UTC (rev 2197)
+++ cgm/trunk/init/InitCGMA.cpp	2008-11-03 15:57:27 UTC (rev 2198)
@@ -33,7 +33,12 @@
 #  include "AcisModifyEngine.hpp"
 #endif
 
+#if defined(HAVE_OCC) 
+#  include "OCCQueryEngine.hpp"
+#  include "OCCModifyEngine.hpp"
+#endif
 
+
 static bool streq_nocase( const char* s, const char* t )
 {
   for (; *s; ++s, ++t) 
@@ -69,7 +74,12 @@
   else if (streq_nocase(name,"VIRTUAL") || streq_nocase(name,"vg")) {
     VirtualQueryEngine::instance();
   }
-  
+#ifdef HAVE_OCC  
+  else if (streq_nocase(name,"OCC") || streq_nocase(name,"occ")) {
+    OCCQueryEngine::instance();
+    OCCModifyEngine::instance();
+  }
+#endif  
   else if (streq_nocase(name,"facet")) {
     FacetQueryEngine::instance();
     FacetModifyEngine::instance();

Modified: cgm/trunk/init/Makefile.am
===================================================================
--- cgm/trunk/init/Makefile.am	2008-11-03 15:36:31 UTC (rev 2197)
+++ cgm/trunk/init/Makefile.am	2008-11-03 15:57:27 UTC (rev 2198)
@@ -3,7 +3,7 @@
 
 
 # Override default defines with the ones we want from the configure script
-DEFS = $(TEMPLATE_DEFS_INCLUDED) $(LITTLE_ENDIAN) $(HAVE_ACIS_DEF) $(CUBIT_CGM)
+DEFS = $(TEMPLATE_DEFS_INCLUDED) $(LITTLE_ENDIAN) $(HAVE_ACIS_DEF) $(HAVE_OCC_DEF) $(CUBIT_CGM)
 INCLUDES = -I$(top_srcdir)/geom \
            -I$(top_srcdir)/util \
            -I$(top_srcdir)/geom/ACIS \

Modified: cgm/trunk/itaps/Makefile.am
===================================================================
--- cgm/trunk/itaps/Makefile.am	2008-11-03 15:36:31 UTC (rev 2197)
+++ cgm/trunk/itaps/Makefile.am	2008-11-03 15:57:27 UTC (rev 2198)
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 
-DEFS = $(TEMPLATE_DEFS_INCLUDED) $(HAVE_ACIS_DEF)
+DEFS = $(TEMPLATE_DEFS_INCLUDED) $(HAVE_ACIS_DEF) $(HAVE_OCC_DEF) 
 
 if USE_BABEL
   SIDL_DIR = SIDL

Modified: cgm/trunk/itaps/iGeom_CGMA.cc
===================================================================
--- cgm/trunk/itaps/iGeom_CGMA.cc	2008-11-03 15:36:31 UTC (rev 2197)
+++ cgm/trunk/itaps/iGeom_CGMA.cc	2008-11-03 15:57:27 UTC (rev 2198)
@@ -237,9 +237,18 @@
     ERROR(iBase_NOT_SUPPORTED, "No options for iGeom factory have been implemented.");
   }
   
-  InitCGMA::initialize_cgma();
-  InitCGMA::initialize_engine("ACIS");
+  CubitStatus status = InitCGMA::initialize_cgma();
+  if (CUBIT_SUCCESS != status) RETURN(iBase_FAILURE);
 
+#ifdef HAVE_ACIS  
+  status = InitCGMA::initialize_engine("ACIS");
+  if (CUBIT_SUCCESS != status) RETURN(iBase_FAILURE);
+#endif
+
+#ifdef HAVE_OCC
+  InitCGMA::initialize_engine("OCC");
+#endif
+
 // sometimes can't have following, depending on CGM version
   // CGMApp::instance()->attrib_manager()->silent_flag(true);
 

Modified: cgm/trunk/test/Makefile.am
===================================================================
--- cgm/trunk/test/Makefile.am	2008-11-03 15:36:31 UTC (rev 2197)
+++ cgm/trunk/test/Makefile.am	2008-11-03 15:57:27 UTC (rev 2198)
@@ -1,6 +1,6 @@
 
 # Override default defines with the ones we want from the configure script
-DEFS = $(TEMPLATE_DEFS_INCLUDED) $(LITTLE_ENDIAN) $(HAVE_ACIS_DEF) $(CUBIT_CGM)
+DEFS = $(TEMPLATE_DEFS_INCLUDED) $(LITTLE_ENDIAN) $(HAVE_ACIS_DEF) $(HAVE_OCC_DEF) $(CUBIT_CGM)
 INCLUDES = -I$(top_srcdir)/geom \
            -I$(top_srcdir)/util \
            -I$(top_srcdir)/init \

More information about the cgma-dev mailing list