Attributes for AMR cartesian mesh developped. Ready to test.

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

diff --git a/src/MEDLoader/CMakeLists.txt b/src/MEDLoader/CMakeLists.txt
index 9929df78b05912e4ca6f247b1aea19654ea2b742..dbe85b47fbab0a60e739e4bed5762195a482989c 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-2014  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,10 +20,6 @@
 
 ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${MEDFILE_DEFINITIONS} ${XDR_DEFINITIONS})
 
-IF(WIN32)
- ADD_DEFINITIONS(-DNOMINMAX)
-ENDIF(WIN32)
-
 IF(SALOME_MED_ENABLE_PYTHON)
   ADD_SUBDIRECTORY(Swig)
 ENDIF(SALOME_MED_ENABLE_PYTHON)
@@ -37,8 +33,9 @@ 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})
+    ADD_DEFINITIONS(-DNOMINMAX)
+    SET(MEDLOADER_XDR_INCLUDE_DIRS ${XDR_INCLUDE_DIRS})
+    SET(MEDLOADER_XDR_LIBRARIES ${XDR_LIBRARIES})
   ENDIF(SALOME_MED_MEDLOADER_USE_XDR)
 ELSE(WIN32)
   SET(MEDLOADER_XDR_INCLUDE_DIRS ${XDR_INCLUDE_DIRS})