From: vsr <vsr@opencascade.com>
Date: Fri, 2 Dec 2016 09:56:53 +0000 (+0300)
Subject: 0023400: EDF 13890 MEDCalc: SIGSEGV when Salome closing.
X-Git-Tag: V8_2_0rc1~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f922d290015670817fcf1a60ba98bb08d5680be8;p=modules%2Fmed.git

0023400: EDF 13890 MEDCalc: SIGSEGV when Salome closing.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ecbf3933b..b0e9d937d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -248,7 +248,7 @@ IF(SALOME_USE_MPI)
 ENDIF()
 
 LIST(APPEND _${PROJECT_NAME}_exposed_targets
-    medcouplingcorba medcouplingclient medcalculator MEDFactoryEngine)
+    medcouplingcorba medcouplingclient medcalculator MEDEngineCommon MEDFactoryEngine MEDEngine)
 IF(SALOME_MED_ENABLE_PYTHON)
   LIST(APPEND _${PROJECT_NAME}_exposed_targets medcalculatorspython)
 ENDIF()
diff --git a/SalomeMEDConfig.cmake.in b/SalomeMEDConfig.cmake.in
index c1adbf874..201fd6788 100644
--- a/SalomeMEDConfig.cmake.in
+++ b/SalomeMEDConfig.cmake.in
@@ -133,6 +133,8 @@ SET(MED_medcouplingcorba medcouplingcorba)
 SET(MED_medcouplingclient medcouplingclient)
 SET(MED_medcalculator medcalculator)
 SET(MED_medcalculatorspython medcalculatorspython)
+SET(MED_MEDEngineCommon MEDEngineCommon)
 SET(MED_MEDFactoryEngine MEDFactoryEngine)
+SET(MED_MEDEngine MEDEngine)
 SET(MED_MEDCALCGUI_dialogs MEDCALCGUI_dialogs)
 SET(MED_MEDCALCGUI MEDCALCGUI)
diff --git a/src/MEDCalc/cmp/CMakeLists.txt b/src/MEDCalc/cmp/CMakeLists.txt
index 70c383a38..04baec0b7 100644
--- a/src/MEDCalc/cmp/CMakeLists.txt
+++ b/src/MEDCalc/cmp/CMakeLists.txt
@@ -48,13 +48,15 @@ SET(COMMON_SOURCES
   MEDPresentationDeflectionShape.cxx  
 )
 
-SET(MEDFactoryEngine_SOURCES
+SET(MEDEngineCommon_SOURCES
   ${COMMON_SOURCES}
+)
+
+SET(MEDFactoryEngine_SOURCES
   MEDFactory_i.cxx
 )
 
 SET(MEDEngine_SOURCES
-  ${COMMON_SOURCES}
   MED.cxx
 )
 
@@ -76,15 +78,20 @@ IF(WIN32)
   SET(COMMON_FLAGS "${COMMON_FLAGS} -DNOMINMAX")
 ENDIF(WIN32)
 
+ADD_LIBRARY(MEDEngineCommon SHARED ${MEDEngineCommon_SOURCES})
+SET_TARGET_PROPERTIES(MEDEngineCommon PROPERTIES COMPILE_FLAGS "${COMMON_FLAGS}")
+TARGET_LINK_LIBRARIES(MEDEngineCommon ${COMMON_LIBS})
+
 ADD_LIBRARY(MEDFactoryEngine SHARED ${MEDFactoryEngine_SOURCES})
 SET_TARGET_PROPERTIES(MEDFactoryEngine PROPERTIES COMPILE_FLAGS "${COMMON_FLAGS}")
-TARGET_LINK_LIBRARIES(MEDFactoryEngine ${COMMON_LIBS})
+TARGET_LINK_LIBRARIES(MEDFactoryEngine ${COMMON_LIBS} MEDEngineCommon)
 
 ADD_LIBRARY(MEDEngine SHARED ${MEDEngine_SOURCES})
 SET_TARGET_PROPERTIES(MEDEngine PROPERTIES COMPILE_FLAGS "${COMMON_FLAGS}")
-TARGET_LINK_LIBRARIES(MEDEngine ${COMMON_LIBS})
+TARGET_LINK_LIBRARIES(MEDEngine ${COMMON_LIBS} MEDEngineCommon)
 
 #INSTALL(TARGETS MEDFactoryEngine DESTINATION ${SALOME_INSTALL_LIBS})
+INSTALL(TARGETS MEDEngineCommon EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 INSTALL(TARGETS MEDFactoryEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 INSTALL(TARGETS MEDEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})