Merge branch 'abn/tests_from_build'

[tools/medcoupling.git] / src / MEDLoader / CMakeLists.txt

diff --git a/src/MEDLoader/CMakeLists.txt b/src/MEDLoader/CMakeLists.txt
index 9929df78b05912e4ca6f247b1aea19654ea2b742..b2f6e8e1c5cda183f13c57b5569cb6e220bb7104 100644 (file)
--- 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-2015  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
@@ -20,26 +20,23 @@
 
 ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${MEDFILE_DEFINITIONS} ${XDR_DEFINITIONS})
 
-IF(WIN32)
- ADD_DEFINITIONS(-DNOMINMAX)
-ENDIF(WIN32)
-
-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(SALOME_MED_MEDLOADER_USE_XDR)
-      SET(MEDLOADER_XDR_INCLUDE_DIRS ${XDR_INCLUDE_DIRS})
-      SET(MEDLOADER_XDR_LIBRARIES ${XDR_LIBRARIES})
-  ENDIF(SALOME_MED_MEDLOADER_USE_XDR)
+  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})
 ENDIF(WIN32)
@@ -65,6 +62,8 @@ SET(medloader_SOURCES
   MEDFileBasis.cxx
   MEDFileMeshLL.cxx
   MEDFileField.cxx
+  MEDFileJoint.cxx
+  MEDFileEquivalence.cxx
   MEDFileParameter.cxx
   MEDFileData.cxx
   MEDFileFieldOverView.cxx
@@ -77,10 +76,10 @@ SET(medloader_SOURCES
 ADD_LIBRARY(medloader SHARED ${medloader_SOURCES})
 SET_TARGET_PROPERTIES(medloader PROPERTIES COMPILE_FLAGS "")
 TARGET_LINK_LIBRARIES(medloader medcoupling ${MEDFILE_C_LIBRARIES} ${HDF5_LIBRARIES} ${MEDLOADER_XDR_LIBRARIES})
-INSTALL(TARGETS medloader EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
+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})
+INSTALL(FILES ${medloader_HEADERS_HXX} DESTINATION ${MEDCOUPLING_INSTALL_HEADERS})
 
 # To allow usage as SWIG dependencies:
 SET(medloader_HEADERS_HXX PARENT_SCOPE)