X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCalc%2Fcmp%2FCMakeLists.txt;h=34dec257624a32a1807cff972acdd4e99d8d5120;hb=c933321e259af4968b2469c1d4f6b7ac5178e294;hp=63415add6e5c2ee18715fc1ca79656d4c6395f53;hpb=e0883c7231506a8d94f0241c442cacdead1a7a24;p=modules%2Fmed.git diff --git a/src/MEDCalc/cmp/CMakeLists.txt b/src/MEDCalc/cmp/CMakeLists.txt index 63415add6..34dec2576 100644 --- a/src/MEDCalc/cmp/CMakeLists.txt +++ b/src/MEDCalc/cmp/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2016 CEA/DEN, EDF R&D +# Copyright (C) 2012-2024 CEA, EDF # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -29,7 +29,6 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. ${PROJECT_BINARY_DIR}/idl - ${GUI_INCLUDE_DIRS} # For PyLockWrapper ) SET(COMMON_SOURCES @@ -40,22 +39,34 @@ SET(COMMON_SOURCES MEDPresentationManager_i.cxx MEDPresentation.cxx # presentations + MEDPresentationMeshView.cxx MEDPresentationScalarMap.cxx MEDPresentationContour.cxx MEDPresentationVectorField.cxx MEDPresentationSlices.cxx - MEDPresentationDeflectionShape.cxx MEDPresentationPointSprite.cxx + MEDPresentationPlot3D.cxx + MEDPresentationDeflectionShape.cxx + MEDPresentationStreamLines.cxx + MEDPresentationCutSegment.cxx + MEDFactory_i.cxx + MEDFactory_No_Session_i.cxx + MEDFactory_Session_i.cxx + ) -SET(MEDFactoryEngine_SOURCES +SET(MEDEngineCommon_SOURCES ${COMMON_SOURCES} - MEDFactory_i.cxx +) + +SET(MEDFactoryEngine_SOURCES + _MEDFactory_Session_i.cxx ) SET(MEDEngine_SOURCES - ${COMMON_SOURCES} MED.cxx + MED_Session.cxx + MED_No_Session.cxx ) SET(COMMON_LIBS @@ -69,7 +80,6 @@ SET(COMMON_LIBS ${OMNIORB_LIBRARIES} ${PYTHON_LIBRARIES} ${MEDCoupling_medcoupling} ${MEDCoupling_medloader} ${MEDCoupling_medcouplingremapper} - ${GUI_PyInterp} ) # This undefines the macros MIN and MAX which are specified in the windows headers @@ -77,17 +87,22 @@ 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}) +ADD_LIBRARY(FIELDSEngine SHARED ${MEDEngine_SOURCES}) +SET_TARGET_PROPERTIES(FIELDSEngine PROPERTIES COMPILE_FLAGS "${COMMON_FLAGS}") +TARGET_LINK_LIBRARIES(FIELDSEngine ${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}) +INSTALL(TARGETS FIELDSEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) FILE(GLOB MEDCALC_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") INSTALL(FILES ${MEDCALC_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})