Remove dependency on other MR

cmake/modules/AddMPIFlags.cmake

@@ -24,11 +24,8 @@ set_package_properties("MPI" PROPERTIES
 if(MPI_C_FOUND)
   set(HAVE_MPI ${MPI_C_FOUND})
 
-  dune_register_package_flags(
-    COMPILE_DEFINITIONS
-      "HAVE_MPI=1;MPICH_SKIP_MPICXX=1;OMPI_SKIP_MPICXX=1;MPI_NO_CPPBIND=1;MPIPP_H;_MPICC_H"
-    LIBRARIES
-      MPI::MPI_C)
+  dune_register_package_flags(COMPILE_DEFINITIONS "HAVE_MPI=1"
+                              LIBRARIES MPI::MPI_C)
 endif()
 
 # adds MPI flags to the targets
@@ -39,8 +36,7 @@ function(add_dune_mpi_flags)
   if(MPI_C_FOUND)
     foreach(target ${targets})
       target_link_libraries(${target} PUBLIC MPI::MPI_C)
-      target_compile_definitions(${target} PUBLIC
-        HAVE_MPI=1 MPICH_SKIP_MPICXX=1 OMPI_SKIP_MPICXX=1 MPI_NO_CPPBIND=1 MPIPP_H _MPICC_H)
+      target_compile_definitions(${target} PUBLIC "HAVE_MPI=1")
     endforeach(target)
   endif()
 endfunction(add_dune_mpi_flags)

config.h.cmake

@@ -36,6 +36,15 @@
 /* Define if you have LAPACK library. */
 #cmakedefine HAVE_LAPACK 1
 
+/* Deactivate cxx bindings for MPI */
+#if defined(HAVE_MPI) && HAVE_MPI
+#define MPICH_SKIP_MPICXX 1
+#define OMPI_SKIP_MPICXX 1
+#define MPI_NO_CPPBIND 1
+#define MPIPP_H
+#define _MPICC_H
+#endif
+
 /* Define to 1 if you have the Threading Building Blocks (TBB) library */
 #cmakedefine HAVE_TBB 1