Salome HOME
Merge rnv/win_swig_generation branch.
authorrnv <rnv@opencascade.com>
Tue, 30 May 2017 13:04:13 +0000 (16:04 +0300)
committerrnv <rnv@opencascade.com>
Tue, 30 May 2017 13:04:45 +0000 (16:04 +0300)
1  2 
src/MEDCoupling_Swig/CMakeLists.txt
src/MEDLoader/Swig/CMakeLists.txt
src/MEDPartitioner_Swig/CMakeLists.txt
src/ParaMEDMEM_Swig/CMakeLists.txt
src/RENUMBER_Swig/CMakeLists.txt

index 80dbb4f90486cf38134f14a27a128be3c631e88d,9ae0519e91df7b45c0e7f22a85d4883bc137c60a..ed16b352325728bb3272fd7b3813be8f7c9b8faf
@@@ -95,13 -89,9 +95,13 @@@ ENDIF(
  
  SWIG_ADD_MODULE(MEDCoupling python MEDCoupling.i)
  SWIG_LINK_LIBRARIES(MEDCoupling ${PYTHON_LIBRARIES} ${PLATFORM_LIBS} medcoupling)
+ SWIG_CHECK_GENERATION(MEDCoupling)
  SET_SOURCE_FILES_PROPERTIES(MEDCouplingRemapper.i PROPERTIES CPLUSPLUS ON)
 -SET_SOURCE_FILES_PROPERTIES(MEDCouplingRemapper.i PROPERTIES SWIG_DEFINITIONS "-shadow")
 +IF ("${PYTHON_VERSION_MAJOR}" STREQUAL "3")
 +  SET_SOURCE_FILES_PROPERTIES(MEDCouplingRemapper.i PROPERTIES SWIG_FLAGS "-py3")
 +ELSE()
 +  SET_SOURCE_FILES_PROPERTIES(MEDCouplingRemapper.i PROPERTIES SWIG_DEFINITIONS "-shadow")
 +ENDIF()
  SET(SWIG_MODULE_MEDCouplingRemapper_EXTRA_FLAGS "${NUMPY_DEFINITIONS};${SCIPY_DEFINITIONS}")
  
  # _ABR_ Ensure dependency mechanism on all SWIG files and headers
Simple merge
index 1ef76433796fce1155ee03d83634bc484a5f9534,63fbafdcf3af37865fb55c38e81dfd111d61ffc9..4e867ae6d277d38fbd557291b4b3edf4984f9ec7
@@@ -58,7 -54,11 +58,8 @@@ SET (SWIG_MODULE_ParaMEDMEM_EXTRA_DEPS 
  
  SWIG_ADD_MODULE(ParaMEDMEM python ParaMEDMEM.i)
  SWIG_LINK_LIBRARIES(ParaMEDMEM ${PYTHON_LIBRARIES} paramedmem medloader)
+ SWIG_CHECK_GENERATION(ParaMEDMEM)
  
 -SET_SOURCE_FILES_PROPERTIES(ParaMEDMEM.i PROPERTIES CPLUSPLUS ON)
 -SET_SOURCE_FILES_PROPERTIES(ParaMEDMEM.i PROPERTIES SWIG_DEFINITIONS "-shadow")
 -
  INSTALL(TARGETS _ParaMEDMEM DESTINATION ${MEDCOUPLING_INSTALL_PYTHON})
  INSTALL(FILES ParaMEDMEM.i DESTINATION ${MEDCOUPLING_INSTALL_HEADERS})
  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/ParaMEDMEM.py test_InterpKernelDEC.py test_NonCoincidentDEC.py test_StructuredCoincidentDEC.py DESTINATION ${MEDCOUPLING_INSTALL_SCRIPT_PYTHON})
Simple merge