Salome HOME
projects
/
modules
/
med.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Addition of new reference coords including degenerated cells.
[modules/med.git]
/
src
/
MEDCouplingCorba
/
CMakeLists.txt
diff --git
a/src/MEDCouplingCorba/CMakeLists.txt
b/src/MEDCouplingCorba/CMakeLists.txt
index 07af5fb49f5881f07393dd7df47cd1fda04d859c..57f427971e8b740414ef67733dfaf09cdf78d132 100644
(file)
--- a/
src/MEDCouplingCorba/CMakeLists.txt
+++ b/
src/MEDCouplingCorba/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 20
07-2012
CEA/DEN, EDF R&D
+# Copyright (C) 20
12-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
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-18,15
+18,16
@@
#
# Author : Anthony Geay (CEA/DEN)
#
# Author : Anthony Geay (CEA/DEN)
+ADD_DEFINITIONS(${OMNIORB_DEFINITIONS})
+
ADD_SUBDIRECTORY(Client)
ADD_SUBDIRECTORY(Client)
-IF
(CPPUNIT_IS_OK
)
+IF
(SALOME_BUILD_TESTS
)
ADD_SUBDIRECTORY(Test)
ADD_SUBDIRECTORY(Test)
-ENDIF
(CPPUNIT_IS_OK
)
+ENDIF
(SALOME_BUILD_TESTS
)
INCLUDE_DIRECTORIES(
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
${CMAKE_CURRENT_BINARY_DIR}/../../idl
${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling
${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL
@@
-38,6
+39,11
@@
SET(medcouplingcorba_SOURCES
MEDCouplingMeshServant.cxx
MEDCouplingPointSetServant.cxx
MEDCouplingExtrudedMeshServant.cxx
MEDCouplingMeshServant.cxx
MEDCouplingPointSetServant.cxx
MEDCouplingExtrudedMeshServant.cxx
+ MEDCouplingStructuredMeshServant.cxx
+ MEDCouplingCurveLinearMeshServant.cxx
+ MEDCoupling1DGTUMeshServant.cxx
+ MEDCoupling1SGTUMeshServant.cxx
+ MEDCoupling1GTUMeshServant.cxx
MEDCouplingCMeshServant.cxx
MEDCouplingUMeshServant.cxx
MEDCouplingFieldServant.cxx
MEDCouplingCMeshServant.cxx
MEDCouplingUMeshServant.cxx
MEDCouplingFieldServant.cxx
@@
-51,9
+57,11
@@
SET(medcouplingcorba_SOURCES
)
ADD_LIBRARY(medcouplingcorba SHARED ${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})
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")
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)