Windows support

diff --git a/src/MEDCoupling_Swig/CMakeLists.txt b/src/MEDCoupling_Swig/CMakeLists.txt
index 9a33c346c2fc2cc81f7675bf498b6fcde89c98c5..3dc442075b060e8d5368bb31f68d75b63647257b 100644 (file)
--- a/src/MEDCoupling_Swig/CMakeLists.txt
+++ b/src/MEDCoupling_Swig/CMakeLists.txt
@@ -90,6 +90,8 @@ ENDIF()
 IF(WIN32)
   # Under Windows MEDCoupling conflicts wiht medcoupling from PyWrapping
   SET(MEDCouling_target_name MEDCouplingCompat)
+  SET_PROPERTY(SOURCE MEDCoupling.i PROPERTY SWIG_MODULE_NAME MEDCouplingCompat)
+  SET_PROPERTY(SOURCE MEDCoupling.i PROPERTY COMPILE_DEFINITIONS WIN32)
 ELSE()
   SET(MEDCouling_target_name MEDCoupling)
 ENDIF()
@@ -130,7 +132,13 @@ IF(WIN32)
 ENDIF(WIN32)
 INSTALL(TARGETS ${SWIG_MODULE_${MEDCouling_target_name}_REAL_NAME} ${SWIG_MODULE_MEDCouplingRemapper_REAL_NAME} DESTINATION ${MEDCOUPLING_INSTALL_PYTHON})
 
-SET(PYFILES_TO_INSTALL ${CMAKE_CURRENT_BINARY_DIR}/MEDCoupling.py ${CMAKE_CURRENT_BINARY_DIR}/MEDCouplingRemapper.py)
+SET(PYFILES_TO_INSTALL ${CMAKE_CURRENT_BINARY_DIR}/MEDCouplingRemapper.py)
+IF(WIN32)
+  SET(PYFILES_TO_INSTALL ${PYFILES_TO_INSTALL} ${CMAKE_CURRENT_BINARY_DIR}/MEDCouplingCompat.py)
+ELSE()
+  SET(PYFILES_TO_INSTALL ${PYFILES_TO_INSTALL} ${CMAKE_CURRENT_BINARY_DIR}/MEDCoupling.py)
+ENDIF()
+
 SALOME_INSTALL_SCRIPTS("${PYFILES_TO_INSTALL}" ${MEDCOUPLING_INSTALL_PYTHON} EXTRA_DPYS "${SWIG_MODULE_${MEDCouling_target_name}_REAL_NAME};${SWIG_MODULE_MEDCouplingRemapper_REAL_NAME}")
 
 INSTALL(FILES ${MC_Swig_interf} DESTINATION ${MEDCOUPLING_INSTALL_HEADERS})

diff --git a/src/MEDCoupling_Swig/MEDCoupling.i b/src/MEDCoupling_Swig/MEDCoupling.i
index 6f84bb74cbcf1ddd4d77098a2128b4345ef17b61..7bb789e37f468da515fd5cd2cc4b6b4b1bdb9a49 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCoupling.i
+++ b/src/MEDCoupling_Swig/MEDCoupling.i
@@ -17,7 +17,11 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
+#ifdef WIN32
+%module MEDCouplingCompat
+#else 
 %module MEDCoupling
+#endif
 
 %include "MEDCouplingCommon.i"
 

diff --git a/src/PyWrapping/CMakeLists.txt b/src/PyWrapping/CMakeLists.txt
index 1d05b34d017a93c9bb83ef1496cc6094038b7af5..1ec4528c062cdba04c10ba035d8027cfe1e4e067 100644 (file)
--- a/src/PyWrapping/CMakeLists.txt
+++ b/src/PyWrapping/CMakeLists.txt
@@ -92,6 +92,8 @@ SWIG_LINK_LIBRARIES(medcoupling ${medcoupling_LIB_dependancies})
 SWIG_CHECK_GENERATION(medcoupling)
 IF(WIN32)
   SET_TARGET_PROPERTIES(_medcoupling PROPERTIES DEBUG_OUTPUT_NAME _medcoupling_d)
+  # To increase the size of the .obj file on Windows because MEDLoaderPYTHON_wrap.cxx, generated by SWIG, is too big
+  TARGET_COMPILE_OPTIONS(_medcoupling PRIVATE /bigobj) 
 ENDIF(WIN32)
 
 INSTALL(TARGETS _medcoupling DESTINATION ${MEDCOUPLING_INSTALL_PYTHON})