From eec50e21957dc0b2171773b8da9c96029a77b5e9 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Fri, 29 Dec 2017 09:07:48 +0100 Subject: [PATCH] ParaMEDMEM is in medcoupling --- src/PyWrapping/CMakeLists.txt | 10 ++++++++++ src/PyWrapping/medcoupling.i | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/src/PyWrapping/CMakeLists.txt b/src/PyWrapping/CMakeLists.txt index 3649fdb1f..e079b9997 100644 --- a/src/PyWrapping/CMakeLists.txt +++ b/src/PyWrapping/CMakeLists.txt @@ -52,6 +52,9 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../RENUMBER_Swig ${CMAKE_CURRENT_SOURCE_DIR}/../MEDPartitioner ${CMAKE_CURRENT_SOURCE_DIR}/../MEDPartitioner_Swig + ${CMAKE_CURRENT_SOURCE_DIR}/../ICoCo + ${CMAKE_CURRENT_SOURCE_DIR}/../ParaMEDMEM + ${CMAKE_CURRENT_SOURCE_DIR}/../ParaMEDMEM_Swig ${PROJECT_BINARY_DIR}/doc ) @@ -72,6 +75,13 @@ IF(MEDCOUPLING_ENABLE_PARTITIONER) LIST(APPEND medcoupling_LIB_dependancies medpartitionercpp) ENDIF(MEDCOUPLING_ENABLE_PARTITIONER) +IF(MEDCOUPLING_USE_MPI) + INCLUDE_DIRECTORIES(${MPI_INCLUDE_DIRS}) + ADD_DEFINITIONS(${MPI_DEFINITIONS}) + LIST(APPEND SWIG_MODULE_medcoupling_EXTRA_FLAGS -DWITH_PARALLEL_INTERPOLATOR) + LIST(APPEND medcoupling_LIB_dependancies paramedmem) +ENDIF(MEDCOUPLING_USE_MPI) + SWIG_ADD_MODULE(medcoupling python medcoupling.i) SWIG_LINK_LIBRARIES(medcoupling ${medcoupling_LIB_dependancies}) SWIG_CHECK_GENERATION(medcoupling) diff --git a/src/PyWrapping/medcoupling.i b/src/PyWrapping/medcoupling.i index 8b9e67012..783471359 100644 --- a/src/PyWrapping/medcoupling.i +++ b/src/PyWrapping/medcoupling.i @@ -42,6 +42,9 @@ %include "MEDPartitionerCommon.i" #endif +#ifdef WITH_PARALLEL_INTERPOLATOR +%include "ParaMEDMEMCommon.i" +#endif %{ static const char SEQ_INTERPOL_EXT[]="Sequential interpolator"; @@ -74,6 +77,9 @@ #endif #ifdef WITH_PARTITIONER ret.push_back(std::string(PART_EXT)); +#endif +#ifdef WITH_PARALLEL_INTERPOLATOR + ret.push_back(std::string(PAR_INTERPOL_EXT)); #endif return ret; } -- 2.39.2