X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDLoader%2FCMakeLists.txt;h=c5150e7d33d21a5846c328a5591c8652f4eccbd6;hb=8d65b3fe9fcfb3f41dadfe696f3853bfcc2d1cdf;hp=aff35f6b94734938c0b65fa257d834bff7c02719;hpb=af1f67e0fd23c40add0609f2597abdb2d7a1dbb6;p=tools%2Fmedcoupling.git

diff --git a/src/MEDLoader/CMakeLists.txt b/src/MEDLoader/CMakeLists.txt
index aff35f6b9..c5150e7d3 100644
--- a/src/MEDLoader/CMakeLists.txt
+++ b/src/MEDLoader/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2019  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,19 +18,34 @@
 #
 # Author : Anthony Geay (CEA/DEN)
 
-ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${MEDFILE_DEFINITIONS} ${PLATFORM_DEFINITIONS})
+ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${MEDFILE_DEFINITIONS} ${XDR_DEFINITIONS})
 
-IF(SALOME_MED_ENABLE_PYTHON)
+IF(MEDCOUPLING_ENABLE_PYTHON)
   ADD_SUBDIRECTORY(Swig)
-ENDIF(SALOME_MED_ENABLE_PYTHON)
+ENDIF(MEDCOUPLING_ENABLE_PYTHON)
 
-IF(SALOME_BUILD_TESTS)
+IF(MEDCOUPLING_BUILD_TESTS)
   ADD_SUBDIRECTORY(Test)
-ENDIF(SALOME_BUILD_TESTS)
+ENDIF(MEDCOUPLING_BUILD_TESTS)
+
+SET(MEDLOADER_XDR_INCLUDE_DIRS)
+SET(MEDLOADER_XDR_LIBRARIES)
+
+IF(WIN32)
+  IF(MEDCOUPLING_MEDLOADER_USE_XDR)
+    ADD_DEFINITIONS(-DNOMINMAX)
+    SET(MEDLOADER_XDR_INCLUDE_DIRS ${XDR_INCLUDE_DIRS})
+    SET(MEDLOADER_XDR_LIBRARIES ${XDR_LIBRARIES})
+  ENDIF(MEDCOUPLING_MEDLOADER_USE_XDR)
+ELSE(WIN32)
+  SET(MEDLOADER_XDR_INCLUDE_DIRS ${XDR_INCLUDE_DIRS})
+  SET(MEDLOADER_XDR_LIBRARIES ${XDR_LIBRARIES})
+ENDIF(WIN32)
 
 INCLUDE_DIRECTORIES(
   ${MEDFILE_INCLUDE_DIRS}
   ${HDF5_INCLUDE_DIRS}
+  ${MEDLOADER_XDR_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Bases
@@ -42,28 +57,40 @@ INCLUDE_DIRECTORIES(
 SET(medloader_SOURCES
   MEDLoader.cxx
   MEDLoaderBase.cxx
+  MEDLoaderTraits.cxx
   MEDFileUtilities.cxx
   MEDFileMesh.cxx
   MEDFileMeshElt.cxx
   MEDFileBasis.cxx
   MEDFileMeshLL.cxx
   MEDFileField.cxx
+  MEDFileFieldInternal.cxx
+  MEDFileFieldGlobs.cxx
+  MEDFileField1TS.cxx
+  MEDFileFieldMultiTS.cxx
+  MEDFileJoint.cxx
+  MEDFileEquivalence.cxx
   MEDFileParameter.cxx
   MEDFileData.cxx
   MEDFileFieldOverView.cxx
   MEDFileMeshReadSelector.cxx
+  MEDFileMeshSupport.cxx
+  MEDFileStructureElement.cxx
+  MEDFileEntities.cxx
+  MEDFileBlowStrEltUp.cxx
   SauvMedConvertor.cxx
   SauvReader.cxx
   SauvWriter.cxx
   )
 
-ADD_LIBRARY(medloader SHARED ${medloader_SOURCES})
+ADD_LIBRARY(medloader ${medloader_SOURCES})
 SET_TARGET_PROPERTIES(medloader PROPERTIES COMPILE_FLAGS "")
-TARGET_LINK_LIBRARIES(medloader medcoupling ${MEDFILE_C_LIBRARIES} ${HDF5_LIBRARIES})
-INSTALL(TARGETS medloader EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
+TARGET_LINK_LIBRARIES(medloader medcouplingcpp ${MEDFILE_C_LIBRARIES} ${HDF5_LIBRARIES} ${MEDLOADER_XDR_LIBRARIES})
+INSTALL(TARGETS medloader EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${MEDCOUPLING_INSTALL_LIBS})
 
 FILE(GLOB medloader_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
-INSTALL(FILES ${medloader_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})
+FILE(GLOB medloader_HEADERS_TXX "${CMAKE_CURRENT_SOURCE_DIR}/*.txx")
+INSTALL(FILES ${medloader_HEADERS_HXX} ${medloader_HEADERS_TXX} DESTINATION ${MEDCOUPLING_INSTALL_HEADERS})
 
 # To allow usage as SWIG dependencies:
 SET(medloader_HEADERS_HXX PARENT_SCOPE)