[cgma-dev] r4011 - in cgm/trunk: . init

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-06-17 18:09:38 -0500 (Thu, 17 Jun 2010)
New Revision: 4011

Modified:
   cgm/trunk/configure.ac
   cgm/trunk/init/InitCGMA.cpp
   cgm/trunk/init/InitCGMA.hpp
Log:
Adding a deinitialize_cgma function, to shutdown the library.  Also adding
a -L flag to the build stuff.


Modified: cgm/trunk/configure.ac
===================================================================
--- cgm/trunk/configure.ac	2010-06-17 22:48:19 UTC (rev 4010)
+++ cgm/trunk/configure.ac	2010-06-17 23:09:38 UTC (rev 4011)
@@ -129,7 +129,7 @@
     AC_LINK_IFELSE([AC_LANG_PROGRAM(
       [class AcisQueryEngine { public: static AcisQueryEngine* instance_; };],
       [AcisQueryEngine::instance_ = 0;])],
-      [CUBIT_LIBS="-lcubiti$num"
+      [CUBIT_LIBS="-L${CUBIT_BIN_DIR} -lcubiti$num"
        CUBIT_FILE=`expr x"$file" : x"$CUBIT_BIN_DIR/\(.*\)"`
        CUBIT_FILE="${CUBIT_BIN_DIR}/$CUBIT_FILE"
        AC_MSG_RESULT(yes)

Modified: cgm/trunk/init/InitCGMA.cpp
===================================================================
--- cgm/trunk/init/InitCGMA.cpp	2010-06-17 22:48:19 UTC (rev 4010)
+++ cgm/trunk/init/InitCGMA.cpp	2010-06-17 23:09:38 UTC (rev 4011)
@@ -134,3 +134,9 @@
   return CUBIT_SUCCESS;
 }
 
+CubitStatus InitCGMA::deinitialize_cgma() 
+{
+  CGMApp::instance()->shutdown();
+  return CUBIT_SUCCESS;
+}
+

Modified: cgm/trunk/init/InitCGMA.hpp
===================================================================
--- cgm/trunk/init/InitCGMA.hpp	2010-06-17 22:48:19 UTC (rev 4010)
+++ cgm/trunk/init/InitCGMA.hpp	2010-06-17 23:09:38 UTC (rev 4011)
@@ -8,6 +8,8 @@
 public:
 
   static CubitStatus initialize_cgma( const char* default_engine_name = 0 );
+
+  static CubitStatus deinitialize_cgma();
 };
 
 #endif