X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCouplingCorba%2FCMakeLists.txt;h=574b65e4f612b252e203b97cc07cd8c1bff17660;hb=2b06481ba4aac1672d1326d7bfb13e14e529ffb4;hp=07af5fb49f5881f07393dd7df47cd1fda04d859c;hpb=293a6104470482e450701aa8061d9b244f2057d5;p=tools%2Fmedcoupling.git

diff --git a/src/MEDCouplingCorba/CMakeLists.txt b/src/MEDCouplingCorba/CMakeLists.txt
index 07af5fb49..574b65e4f 100644
--- a/src/MEDCouplingCorba/CMakeLists.txt
+++ b/src/MEDCouplingCorba/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2015  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -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
@@ -38,7 +39,13 @@ SET(medcouplingcorba_SOURCES
   MEDCouplingMeshServant.cxx
   MEDCouplingPointSetServant.cxx
   MEDCouplingExtrudedMeshServant.cxx
+  MEDCouplingStructuredMeshServant.cxx
+  MEDCouplingCurveLinearMeshServant.cxx
+  MEDCoupling1DGTUMeshServant.cxx
+  MEDCoupling1SGTUMeshServant.cxx
+  MEDCoupling1GTUMeshServant.cxx
   MEDCouplingCMeshServant.cxx
+  MEDCouplingIMeshServant.cxx
   MEDCouplingUMeshServant.cxx
   MEDCouplingFieldServant.cxx
   MEDCouplingFieldDoubleServant.cxx
@@ -51,9 +58,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)