X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCouplingCorba%2FCMakeLists.txt;h=57f427971e8b740414ef67733dfaf09cdf78d132;hb=0c9d48870957c4a9f6f82fc8e2c569780a5f886b;hp=dbaa5f70086685da0dea7e26d19b32c19ff39afe;hpb=97e267c35d896c3c401989a4a165087c3bebd708;p=modules%2Fmed.git diff --git a/src/MEDCouplingCorba/CMakeLists.txt b/src/MEDCouplingCorba/CMakeLists.txt index dbaa5f700..57f427971 100644 --- a/src/MEDCouplingCorba/CMakeLists.txt +++ b/src/MEDCouplingCorba/CMakeLists.txt @@ -18,15 +18,16 @@ # # Author : Anthony Geay (CEA/DEN) +ADD_DEFINITIONS(${OMNIORB_DEFINITIONS}) + ADD_SUBDIRECTORY(Client) -IF (CPPUNIT_IS_OK) +IF(SALOME_BUILD_TESTS) ADD_SUBDIRECTORY(Test) -ENDIF (CPPUNIT_IS_OK) +ENDIF(SALOME_BUILD_TESTS) INCLUDE_DIRECTORIES( - ${OMNIORB_INCLUDE_DIRS} - ${KERNEL_ROOT_DIR}/include/salome + ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}/../../idl ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL @@ -40,6 +41,9 @@ SET(medcouplingcorba_SOURCES MEDCouplingExtrudedMeshServant.cxx MEDCouplingStructuredMeshServant.cxx MEDCouplingCurveLinearMeshServant.cxx + MEDCoupling1DGTUMeshServant.cxx + MEDCoupling1SGTUMeshServant.cxx + MEDCoupling1GTUMeshServant.cxx MEDCouplingCMeshServant.cxx MEDCouplingUMeshServant.cxx MEDCouplingFieldServant.cxx @@ -53,12 +57,11 @@ SET(medcouplingcorba_SOURCES ) ADD_LIBRARY(medcouplingcorba SHARED ${medcouplingcorba_SOURCES}) -SET_TARGET_PROPERTIES(medcouplingcorba PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS} ${PLATFORM_DEFINITIONS}") TARGET_LINK_LIBRARIES(medcouplingcorba medcoupling SalomeIDLMED ${PLATFORM_LIBS}) -INSTALL(TARGETS medcouplingcorba DESTINATION ${MED_salomelib_LIBS}) +INSTALL(TARGETS medcouplingcorba EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) FILE(GLOB medcouplingcorba_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") -INSTALL(FILES ${medcouplingcorba_HEADERS_HXX} DESTINATION ${MED_salomeinclude_HEADERS}) +INSTALL(FILES ${medcouplingcorba_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS}) # To allow usage as SWIG dependencies: SET(medcouplingcorba_HEADERS_HXX PARENT_SCOPE)