From 3911fae9322f4068316fcc869b929c86205add31 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Fri, 15 Dec 2017 16:45:32 +0100 Subject: [PATCH] MEDPartitioner is in medcoupling python module --- src/MEDPartitioner_Swig/MEDPartitioner.i | 2 ++ src/PyWrapping/CMakeLists.txt | 5 ++++- src/PyWrapping/medcoupling.i | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/MEDPartitioner_Swig/MEDPartitioner.i b/src/MEDPartitioner_Swig/MEDPartitioner.i index 9460fe8c6..5967231a4 100644 --- a/src/MEDPartitioner_Swig/MEDPartitioner.i +++ b/src/MEDPartitioner_Swig/MEDPartitioner.i @@ -26,6 +26,8 @@ using namespace MEDCoupling; using namespace INTERP_KERNEL; %} +%include std_string.i + %feature("autodoc", "1"); %feature("docstring"); diff --git a/src/PyWrapping/CMakeLists.txt b/src/PyWrapping/CMakeLists.txt index 6e6ceb6f5..3f041c0b7 100644 --- a/src/PyWrapping/CMakeLists.txt +++ b/src/PyWrapping/CMakeLists.txt @@ -50,6 +50,8 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/GaussPoints ${CMAKE_CURRENT_SOURCE_DIR}/../RENUMBER ${CMAKE_CURRENT_SOURCE_DIR}/../RENUMBER_Swig + ${CMAKE_CURRENT_SOURCE_DIR}/../MEDPartitioner + ${CMAKE_CURRENT_SOURCE_DIR}/../MEDPartitioner_Swig ${PROJECT_BINARY_DIR}/doc ) @@ -75,7 +77,8 @@ IF(MEDCOUPLING_ENABLE_RENUMBER) ENDIF(MEDCOUPLING_ENABLE_RENUMBER) IF(MEDCOUPLING_ENABLE_PARTITIONER) - + LIST(APPEND SWIG_MODULE_medcoupling_EXTRA_FLAGS -DWITH_PARTITIONER) + LIST(APPEND medcoupling_LIB_dependancies medpartitionercpp) ENDIF(MEDCOUPLING_ENABLE_PARTITIONER) SWIG_ADD_MODULE(medcoupling python medcoupling.i) diff --git a/src/PyWrapping/medcoupling.i b/src/PyWrapping/medcoupling.i index a91106dcb..bce7790ca 100644 --- a/src/PyWrapping/medcoupling.i +++ b/src/PyWrapping/medcoupling.i @@ -36,6 +36,10 @@ %include "MEDRenumberImpl.i" #endif +#ifdef WITH_PARTITIONER +%include "MEDPartitionerCommon.i" +#endif + %pythoncode %{ def MEDCouplingDataArrayDoubleIadd(self,*args): import _medcoupling -- 2.39.2