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
/
MEDCoupling
/
CMakeLists.txt
diff --git
a/src/MEDCoupling/CMakeLists.txt
b/src/MEDCoupling/CMakeLists.txt
index f25bc2bf923d89b417d235dfaa717b1d72ab6520..49dcdf2c8ae55a4b55eed3b1fe8b2932b74c7ad6 100644
(file)
--- a/
src/MEDCoupling/CMakeLists.txt
+++ b/
src/MEDCoupling/CMakeLists.txt
@@
-18,9
+18,9
@@
#
# Author : Anthony Geay (CEA/DEN)
#
# Author : Anthony Geay (CEA/DEN)
-IF(
CPPUNIT_STATU
S)
+IF(
SALOME_BUILD_TEST
S)
ADD_SUBDIRECTORY(Test)
ADD_SUBDIRECTORY(Test)
-ENDIF(
CPPUNIT_STATU
S)
+ENDIF(
SALOME_BUILD_TEST
S)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}/../..
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}/../..
@@
-35,6
+35,7
@@
SET(medcoupling_SOURCES
MEDCouplingField.cxx
MEDCouplingFieldDouble.cxx
MEDCouplingUMesh.cxx
MEDCouplingField.cxx
MEDCouplingFieldDouble.cxx
MEDCouplingUMesh.cxx
+ MEDCoupling1GTUMesh.cxx
MEDCouplingMemArray.cxx
MEDCouplingMemArrayChar.cxx
MEDCouplingTimeLabel.cxx
MEDCouplingMemArray.cxx
MEDCouplingMemArrayChar.cxx
MEDCouplingTimeLabel.cxx
@@
-45,7
+46,6
@@
SET(medcoupling_SOURCES
MEDCouplingFieldDiscretization.cxx
MEDCouplingRefCountObject.cxx
MEDCouplingPointSet.cxx
MEDCouplingFieldDiscretization.cxx
MEDCouplingRefCountObject.cxx
MEDCouplingPointSet.cxx
- MEDCouplingUMeshDesc.cxx
MEDCouplingFieldTemplate.cxx
MEDCouplingExtrudedMesh.cxx
MEDCouplingMesh.cxx
MEDCouplingFieldTemplate.cxx
MEDCouplingExtrudedMesh.cxx
MEDCouplingMesh.cxx
@@
-61,18
+61,16
@@
SET(medcouplingremapper_SOURCES
)
ADD_LIBRARY(medcoupling SHARED ${medcoupling_SOURCES})
)
ADD_LIBRARY(medcoupling SHARED ${medcoupling_SOURCES})
-SET_TARGET_PROPERTIES(medcoupling PROPERTIES COMPILE_FLAGS "${PLATFORM_DEFINITIONS}")
TARGET_LINK_LIBRARIES(medcoupling interpkernel)
TARGET_LINK_LIBRARIES(medcoupling interpkernel)
-INSTALL(TARGETS medcoupling
DESTINATION ${MED_salomelib
_LIBS})
+INSTALL(TARGETS medcoupling
EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL
_LIBS})
ADD_LIBRARY(medcouplingremapper SHARED ${medcouplingremapper_SOURCES})
TARGET_LINK_LIBRARIES(medcouplingremapper medcoupling)
ADD_LIBRARY(medcouplingremapper SHARED ${medcouplingremapper_SOURCES})
TARGET_LINK_LIBRARIES(medcouplingremapper medcoupling)
-SET_TARGET_PROPERTIES(medcouplingremapper PROPERTIES COMPILE_FLAGS "${PLATFORM_DEFINITIONS}")
-INSTALL(TARGETS medcouplingremapper DESTINATION ${MED_salomelib_LIBS})
+INSTALL(TARGETS medcouplingremapper EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
FILE(GLOB medcoupling_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
FILE(GLOB medcoupling_HEADERS_TXX "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
FILE(GLOB medcoupling_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
FILE(GLOB medcoupling_HEADERS_TXX "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
-INSTALL(FILES ${medcoupling_HEADERS_HXX} ${medcoupling_HEADERS_TXX}
DESTINATION ${MED_salomeinclude
_HEADERS})
+INSTALL(FILES ${medcoupling_HEADERS_HXX} ${medcoupling_HEADERS_TXX}
MEDCouplingNatureOfFieldEnum DESTINATION ${SALOME_INSTALL
_HEADERS})
# To allow usage as SWIG dependencies:
SET(medcoupling_HEADERS_HXX PARENT_SCOPE)
# To allow usage as SWIG dependencies:
SET(medcoupling_HEADERS_HXX PARENT_SCOPE)