Salome HOME
projects
/
tools
/
medcoupling.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Very first implementation of MEDCouplingFieldInt.
[tools/medcoupling.git]
/
src
/
MEDCoupling
/
CMakeLists.txt
diff --git
a/src/MEDCoupling/CMakeLists.txt
b/src/MEDCoupling/CMakeLists.txt
index 6ac3fbd8682e3eaba9336fcbc1841b098a16333f..826cbc6dff7805fc61fc4717a21506cddb23b2d1 100644
(file)
--- a/
src/MEDCoupling/CMakeLists.txt
+++ b/
src/MEDCoupling/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-201
4
CEA/DEN, EDF R&D
+# Copyright (C) 2012-201
6
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,12
+18,13
@@
#
# Author : Anthony Geay (CEA/DEN)
#
# Author : Anthony Geay (CEA/DEN)
-IF(
SALOME
_BUILD_TESTS)
+IF(
MEDCOUPLING
_BUILD_TESTS)
ADD_SUBDIRECTORY(Test)
ADD_SUBDIRECTORY(Test)
-ENDIF(
SALOME
_BUILD_TESTS)
+ENDIF(
MEDCOUPLING
_BUILD_TESTS)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}/../..
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}/../..
+ ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL
${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Bases
${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Geometric2D
${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL
${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Bases
${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Geometric2D
@@
-34,6
+35,7
@@
INCLUDE_DIRECTORIES(
SET(medcoupling_SOURCES
MEDCouplingField.cxx
MEDCouplingFieldDouble.cxx
SET(medcoupling_SOURCES
MEDCouplingField.cxx
MEDCouplingFieldDouble.cxx
+ MEDCouplingFieldInt.cxx
MEDCouplingUMesh.cxx
MEDCoupling1GTUMesh.cxx
MEDCouplingMemArray.cxx
MEDCouplingUMesh.cxx
MEDCoupling1GTUMesh.cxx
MEDCouplingMemArray.cxx
@@
-48,7
+50,7
@@
SET(medcoupling_SOURCES
MEDCouplingRefCountObject.cxx
MEDCouplingPointSet.cxx
MEDCouplingFieldTemplate.cxx
MEDCouplingRefCountObject.cxx
MEDCouplingPointSet.cxx
MEDCouplingFieldTemplate.cxx
- MEDCouplingExtrudedMesh.cxx
+ MEDCoupling
Mapped
ExtrudedMesh.cxx
MEDCouplingMesh.cxx
MEDCouplingGaussLocalization.cxx
MEDCouplingNatureOfField.cxx
MEDCouplingMesh.cxx
MEDCouplingGaussLocalization.cxx
MEDCouplingNatureOfField.cxx
@@
-56,23
+58,30
@@
SET(medcoupling_SOURCES
MEDCouplingDefinitionTime.cxx
MEDCouplingFieldOverTime.cxx
MEDCouplingCartesianAMRMesh.cxx
MEDCouplingDefinitionTime.cxx
MEDCouplingFieldOverTime.cxx
MEDCouplingCartesianAMRMesh.cxx
+ MEDCouplingAMRAttribute.cxx
+ MEDCouplingMatrix.cxx
+ MEDCouplingPartDefinition.cxx
+ MEDCouplingSkyLineArray.cxx
+ ../ICoCo/ICoCoField.cxx
+ ../ICoCo/ICoCoMEDField.cxx
)
SET(medcouplingremapper_SOURCES
MEDCouplingRemapper.cxx
)
)
SET(medcouplingremapper_SOURCES
MEDCouplingRemapper.cxx
)
-ADD_LIBRARY(medcoupling
SHARED
${medcoupling_SOURCES})
+ADD_LIBRARY(medcoupling ${medcoupling_SOURCES})
TARGET_LINK_LIBRARIES(medcoupling interpkernel)
TARGET_LINK_LIBRARIES(medcoupling interpkernel)
-INSTALL(TARGETS medcoupling EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${
SALOME
_INSTALL_LIBS})
+INSTALL(TARGETS medcoupling EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${
MEDCOUPLING
_INSTALL_LIBS})
-ADD_LIBRARY(medcouplingremapper
SHARED
${medcouplingremapper_SOURCES})
+ADD_LIBRARY(medcouplingremapper ${medcouplingremapper_SOURCES})
TARGET_LINK_LIBRARIES(medcouplingremapper medcoupling)
TARGET_LINK_LIBRARIES(medcouplingremapper medcoupling)
-INSTALL(TARGETS medcouplingremapper EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${
SALOME
_INSTALL_LIBS})
+INSTALL(TARGETS medcouplingremapper EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${
MEDCOUPLING
_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} MEDCouplingNatureOfFieldEnum DESTINATION ${SALOME_INSTALL_HEADERS})
+FILE(GLOB icoco_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/../ICoCo/*.hxx")
+INSTALL(FILES ${medcoupling_HEADERS_HXX} ${medcoupling_HEADERS_TXX} ${icoco_HEADERS_HXX} MEDCouplingNatureOfFieldEnum DESTINATION ${MEDCOUPLING_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)