-# Copyright (C) 2007-2012 CEA/DEN, EDF R&D
+# Copyright (C) 2012-2013 CEA/DEN, EDF R&D
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
+# Author : Anthony Geay (CEA/DEN)
+
+ADD_DEFINITIONS(${OMNIORB_DEFINITIONS})
ADD_SUBDIRECTORY(Client)
-ADD_SUBDIRECTORY(Test)
+
+IF(SALOME_BUILD_TESTS)
+ ADD_SUBDIRECTORY(Test)
+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
MEDCouplingMeshServant.cxx
MEDCouplingPointSetServant.cxx
MEDCouplingExtrudedMeshServant.cxx
+ MEDCouplingStructuredMeshServant.cxx
+ MEDCouplingCurveLinearMeshServant.cxx
+ MEDCoupling1DGTUMeshServant.cxx
+ MEDCoupling1SGTUMeshServant.cxx
+ MEDCoupling1GTUMeshServant.cxx
MEDCouplingCMeshServant.cxx
MEDCouplingUMeshServant.cxx
MEDCouplingFieldServant.cxx
)
ADD_LIBRARY(medcouplingcorba SHARED ${medcouplingcorba_SOURCES})
-SET_TARGET_PROPERTIES(medcouplingcorba PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS}")
-TARGET_LINK_LIBRARIES(medcouplingcorba medcoupling SalomeIDLMED)
-INSTALL(TARGETS medcouplingcorba DESTINATION ${MED_salomelib_LIBS})
+TARGET_LINK_LIBRARIES(medcouplingcorba medcoupling SalomeIDLMED ${PLATFORM_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)