-THIS IS SALOME - SALOMEGUI VERSION: 3.1.0a
+THIS IS SALOME - SALOMEGUI VERSION: 3.1.0a2
LIB_MOC = RegWidget.h
-LIB_CLIENT_IDL = SALOME_Registry.idl
+LIB_CLIENT_IDL = SALOME_Registry.idl SALOME_Exception.idl
CPPFLAGS+=$(QT_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
LDFLAGS+=$(QT_MT_LIBS) -L$(KERNEL_ROOT_DIR)/lib/salome -lSalomeNS -lOpUtil
CXXFLAGS += $(OCC_CXXFLAGS) $(BOOST_CPPFLAGS)
LDFLAGS += $(QT_MT_LIBS) -L$(KERNEL_ROOT_DIR)/lib/salome -lSalomeNS -lsuit -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace -lSALOMETraceCollector -lEvent -lCASCatch -lSalomeCatalog -lSalomeDS $(CAS_LDPATH) -lTKernel
-LDFLAGSFORBIN= $(LDFLAGS) -lqtx -lSalomeContainer -lSalomeResourcesManager -lTOOLSDS -lSalomeHDFPersist -lSalomeDSImpl -lSalomeGenericObj -lRegistry -lSalomeNotification
+LDFLAGSFORBIN= $(LDFLAGS) $(OMNIORB_LIBS) $(HDF5_LIBS) -lqtx -lSalomeContainer -lSalomeResourcesManager -lTOOLSDS -lSalomeHDFPersist -lSalomeDSImpl -lSalomeGenericObj -lRegistry -lSalomeNotification
@CONCLUDE@
SUIT_Session* aGUISession = 0;
SALOME_NamingService* _NS = 0;
GetInterfaceThread* guiThread = 0;
- SALOMETraceCollector* myThreadTrace = 0;
Session_ServerLauncher* myServerLauncher = 0;
try {
ASSERT( SINGLETON_<ORB_INIT>::IsAlreadyExisting() );
int orbArgc = 1;
orb = init( orbArgc, argv );
- myThreadTrace = SALOMETraceCollector::instance( orb );
// Install SALOME thread event handler
SALOME_Event::GetSessionThread();
delete guiThread;
delete myServerLauncher;
delete _NS;
- delete myThreadTrace;
+
+ LocalTraceBufferPool *bp1 = LocalTraceBufferPool::instance();
+ LocalTraceBufferPool::deleteInstance(bp1);
return result;
}
LIB_MOC = ToolsGUI_CatalogGeneratorDlg.h \
ToolsGUI_RegWidget.h
-LIB_CLIENT_IDL = SALOME_Registry.idl
+LIB_CLIENT_IDL = SALOME_Registry.idl SALOME_Exception.idl
CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
CXXFLAGS += $(OCC_CXXFLAGS) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome