X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling%2FCMakeLists.txt;h=5bd1fccdde9ed920b1b84a77788e53d96563738b;hb=1062fa0bd4e00e0ad3ffbb3306de74cd0226df1d;hp=34ae94365739c5d7fd0f1fc605174c723d171c06;hpb=de984d79297bf264905c1da9af643b99b7f1d05e;p=tools%2Fmedcoupling.git

diff --git a/src/MEDCoupling/CMakeLists.txt b/src/MEDCoupling/CMakeLists.txt
index 34ae94365..5bd1fccdd 100644
--- a/src/MEDCoupling/CMakeLists.txt
+++ b/src/MEDCoupling/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2022  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
@@ -22,6 +22,13 @@ IF(MEDCOUPLING_BUILD_TESTS)
   ADD_SUBDIRECTORY(Test)
 ENDIF(MEDCOUPLING_BUILD_TESTS)
 
+### KILLER WARNINGS TO HELP INT64 MANAGEMENT
+#ADD_DEFINITIONS(-Wextra -Wsynth -Wno-unused-parameter -pedantic -Wall -Wshadow  -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wreturn-type  -Wno-endif-labels  -Wsign-compare -Wmissing-format-attribute -Wno-multichar -Wno-deprecated-declarations -Wpacked -Wredundant-decls -Wlong-long -Wdisabled-optimization -Wunknown-pragmas -Wundef  -Wreorder)
+
+IF (NOT DEFINED MSVC)
+  ADD_DEFINITIONS(-Wsign-compare -Wconversion)
+ENDIF()
+
 INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_BINARY_DIR}/../..
   ${CMAKE_CURRENT_SOURCE_DIR}
@@ -30,18 +37,23 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Geometric2D
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/ExprEval
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/GaussPoints
+  ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/LinearAlgebra
   )
 
 SET(medcoupling_SOURCES
   MEDCouplingField.cxx
+  MEDCouplingFieldFloat.cxx
   MEDCouplingFieldDouble.cxx
-  MEDCouplingFieldInt.cxx
+  MEDCouplingFieldInt32.cxx
+  MEDCouplingFieldInt64.cxx
   MEDCouplingUMesh.cxx
   MEDCouplingUMesh_internal.cxx
   MEDCouplingUMesh_intersection.cxx
   MEDCoupling1GTUMesh.cxx
   MEDCouplingMemArray.cxx
+  MEDCouplingMemArrayFloat.cxx
   MEDCouplingMemArrayChar.cxx
+  MEDCouplingMap.cxx
   MEDCouplingTraits.cxx
   MEDCouplingTimeLabel.cxx
   MEDCouplingCMesh.cxx
@@ -50,6 +62,7 @@ SET(medcoupling_SOURCES
   MEDCouplingStructuredMesh.cxx
   MEDCouplingTimeDiscretization.cxx
   MEDCouplingFieldDiscretization.cxx
+  MEDCouplingFieldDiscretizationOnNodesFE.cxx
   MEDCouplingRefCountObject.cxx
   MEDCouplingPointSet.cxx
   MEDCouplingFieldTemplate.cxx
@@ -66,26 +79,24 @@ SET(medcoupling_SOURCES
   MEDCouplingPartDefinition.cxx
   MEDCouplingSkyLineArray.cxx
   MEDCouplingVoronoi.cxx
-  ../ICoCo/ICoCoField.cxx
-  ../ICoCo/ICoCoMEDField.cxx
-  )
+)
 
 SET(medcouplingremapper_SOURCES
   MEDCouplingRemapper.cxx
   )
 
-ADD_LIBRARY(medcoupling ${medcoupling_SOURCES})
-TARGET_LINK_LIBRARIES(medcoupling interpkernel)
-INSTALL(TARGETS medcoupling EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${MEDCOUPLING_INSTALL_LIBS})
+ADD_LIBRARY(medcouplingcpp ${medcoupling_SOURCES})
+SET_TARGET_PROPERTIES(medcouplingcpp PROPERTIES OUTPUT_NAME "medcoupling")
+TARGET_LINK_LIBRARIES(medcouplingcpp interpkernel)
+INSTALL(TARGETS medcouplingcpp EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${MEDCOUPLING_INSTALL_LIBS})
 
 ADD_LIBRARY(medcouplingremapper ${medcouplingremapper_SOURCES})
-TARGET_LINK_LIBRARIES(medcouplingremapper medcoupling)
+TARGET_LINK_LIBRARIES(medcouplingremapper medcouplingcpp)
 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 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})
+INSTALL(FILES ${medcoupling_HEADERS_HXX} ${medcoupling_HEADERS_TXX} MEDCouplingNatureOfFieldEnum DESTINATION ${MEDCOUPLING_INSTALL_HEADERS})
 
 # To allow usage as SWIG dependencies:
 SET(medcoupling_HEADERS_HXX PARENT_SCOPE)