Merge branch 'V7_7_BR'

diff --git a/src/PVServerService/ServiceLoader/CMakeLists.txt b/src/PVServerService/ServiceLoader/CMakeLists.txt
index 1372bc5c069d00a58f26739e82f2c1db5ebbc7b9..15c1090c8007aa99b9b8a185f0ac2a06c0ecc6e5 100644 (file)
--- a/src/PVServerService/ServiceLoader/CMakeLists.txt
+++ b/src/PVServerService/ServiceLoader/CMakeLists.txt
@@ -61,6 +61,9 @@ INSTALL(TARGETS PVServerServiceLoader EXPORT ${PROJECT_NAME}TargetGroup DESTINAT
 SET_SOURCE_FILES_PROPERTIES(${_SWIG} PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(${_SWIG} PROPERTIES SWIG_DEFINITIONS "-shadow")
 SWIG_ADD_MODULE(PVServer_ServiceLoader python ${_SWIG})
+IF(WIN32)
+  SET_TARGET_PROPERTIES(_PVServer_ServiceLoader PROPERTIES DEBUG_OUTPUT_NAME _PVServer_ServiceLoader_d)
+ENDIF(WIN32)
 SWIG_LINK_LIBRARIES(PVServer_ServiceLoader ${PYTHON_LIBRARIES} PVServerServiceLoader)
 
 INSTALL(TARGETS ${SWIG_MODULE_PVServer_ServiceLoader_REAL_NAME} EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_PYTHON})

diff --git a/src/STD/STD_Application.cxx b/src/STD/STD_Application.cxx
index 47b3a045956daed27f92358db6175835498ac50f..3ec5a29d6b2f886c86fb97448803250404797786 100755 (executable)
--- a/src/STD/STD_Application.cxx
+++ b/src/STD/STD_Application.cxx
@@ -111,7 +111,7 @@ void STD_Application::closeApplication()
     beforeCloseDoc( study );
 
     study->closeDocument();
-
+    emit appClosed();
     setActiveStudy( 0 );
     delete study;
 

diff --git a/src/STD/STD_Application.h b/src/STD/STD_Application.h
index 2b1f4653ca08fde49c86d20fa3c6555293052a90..426e5f811fafd1f101e5a735808f31565fe4c3e7 100755 (executable)
--- a/src/STD/STD_Application.h
+++ b/src/STD/STD_Application.h
@@ -111,6 +111,7 @@ signals:
   void                  viewManagerRemoved( SUIT_ViewManager* );
   /*!emit that view manager activated*/
   void                  viewManagerActivated( SUIT_ViewManager* );
+  void                  appClosed();
 
 public slots:
   virtual void          onNewDoc();