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
22464: [CEA 1046] SEGFAULT when reading a SAUV file in V7.3.0 and V7_main
[tools/medcoupling.git]
/
src
/
MEDLoader
/
CMakeLists.txt
diff --git
a/src/MEDLoader/CMakeLists.txt
b/src/MEDLoader/CMakeLists.txt
index 9929df78b05912e4ca6f247b1aea19654ea2b742..4b369a7151eab48a310ff37e9767dabbc6e61e36 100644
(file)
--- a/
src/MEDLoader/CMakeLists.txt
+++ b/
src/MEDLoader/CMakeLists.txt
@@
-20,10
+20,6
@@
ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${MEDFILE_DEFINITIONS} ${XDR_DEFINITIONS})
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)
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)
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})
ENDIF(SALOME_MED_MEDLOADER_USE_XDR)
ELSE(WIN32)
SET(MEDLOADER_XDR_INCLUDE_DIRS ${XDR_INCLUDE_DIRS})