Add MED engine

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index 69c3b4a6cf16d7ef589bd22257b4db5a9c20f474..09229bd42ccb7001875b06ef5b4b59143f422058 100644 (file)
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -26,6 +26,7 @@ INCLUDE_DIRECTORIES(
 )
 
 SET(SalomeIDLMED_IDLSOURCES
+  MED_Gen.idl
   MEDCouplingCorbaServant.idl
   ParaMEDCouplingCorbaServant.idl
   MEDDataManager.idl

diff --git a/src/MEDCalc/cmp/CMakeLists.txt b/src/MEDCalc/cmp/CMakeLists.txt
index 1c54b6c75902a4b5c25ad768e75c6f3309370863..175ad0eda196676d3eac15cecdb53d2e289225ca 100644 (file)
--- a/src/MEDCalc/cmp/CMakeLists.txt
+++ b/src/MEDCalc/cmp/CMakeLists.txt
@@ -33,15 +33,24 @@ INCLUDE_DIRECTORIES(
   ${PROJECT_SOURCE_DIR}/src/MEDLoader
 )
 
-SET(MEDFactoryEngine_SOURCES
+SET(COMMON_SOURCES
   MEDFactoryClient.cxx
   MEDDataManager_i.cxx
   MEDCalculator_i.cxx
   MEDPresentationManager_i.cxx
-  MEDFactory_i.cxx
   MEDPresentation.cxx
 )
 
+SET(MEDFactoryEngine_SOURCES
+  ${COMMON_SOURCES}
+  MEDFactory_i.cxx
+)
+
+SET(MEDEngine_SOURCES
+  ${COMMON_SOURCES}
+  MED.cxx
+)
+
 SET(COMMON_LIBS
   ${PLATFORM_LIBRARIES}
   SalomeIDLMED
@@ -64,10 +73,16 @@ ADD_LIBRARY(MEDFactoryEngine SHARED ${MEDFactoryEngine_SOURCES})
 SET_TARGET_PROPERTIES(MEDFactoryEngine PROPERTIES COMPILE_FLAGS "${COMMON_FLAGS}")
 TARGET_LINK_LIBRARIES(MEDFactoryEngine ${COMMON_LIBS})
 
-INSTALL(TARGETS MEDFactoryEngine DESTINATION ${SALOME_INSTALL_LIBS})
+ADD_LIBRARY(MEDEngine SHARED ${MEDEngine_SOURCES})
+SET_TARGET_PROPERTIES(MEDEngine PROPERTIES COMPILE_FLAGS "${COMMON_FLAGS}")
+TARGET_LINK_LIBRARIES(MEDEngine ${COMMON_LIBS})
+
+#INSTALL(TARGETS MEDFactoryEngine 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})
 
-FILE(GLOB MEDFactoryEngine_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
-INSTALL(FILES ${MEDFactoryEngine_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})
+FILE(GLOB MEDCALC_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
+INSTALL(FILES ${MEDCALC_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})
 
 IF(SALOME_ENABLE_PYTHON)
   INSTALL(FILES test_medcalc_components.py PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ DESTINATION ${SALOME_INSTALL_BINS}/xmed)