cmake: Change how we're handling MPI.

Author: Matthew Emmett

CMakeLists.txt

@@ -20,8 +20,8 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${pfasst_SOURCE_DIR}/dist/lib")
 
 if(${pfasst_WITH_MPI})
     find_package(MPI REQUIRED)
-    set(CMAKE_C_COMPILER ${MPI_C_COMPILER})
-    set(CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
+    # set(CMAKE_C_COMPILER ${MPI_C_COMPILER})
+    # set(CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
     message(STATUS "Using MPI C++ Compiler: ${MPI_CXX_COMPILER}")
 endif()
 
@@ -103,6 +103,6 @@ message(STATUS "****************************************************************
 
 message(STATUS "C++ Compiler ID: ${CMAKE_CXX_COMPILER_ID}")
 message(STATUS "C++ Compiler Names: ${CMAKE_CXX_COMPILER_NAMES}")
-message(STATUS "C++ Compiler Version: ${CMAKE_CXX_COMPILER_VERSION}") 
+message(STATUS "C++ Compiler Version: ${CMAKE_CXX_COMPILER_VERSION}")
 message(STATUS "C++ Flags: ${CMAKE_CXX_FLAGS}")
 message(STATUS "C++ link flags: ${CMAKE_CXX_LINK_FLAGS}")

examples/advection_diffusion/CMakeLists.txt

@@ -15,6 +15,7 @@ set(advec_examples
 )
 
 set(advec_mpi_examples)
+
 if(${pfasst_WITH_MPI})
     set(advec_mpi_examples
         mpi_pfasst
@@ -52,6 +53,16 @@ foreach(example ${advec_examples})
 endforeach(example)
 
 if(${pfasst_WITH_MPI})
+    include_directories(${MPI_CXX_INCLUDE_PATH})
+    foreach(example ${advec_mpi_examples})
+	if(MPI_COMPILE_FLAGS)
+            set_target_properties(${example} PROPERTIES COMPILE_FLAGS "${MPI_COMPILE_FLAGS}")
+        endif()
+        if(MPI_LINK_FLAGS)
+            set_target_properties(${example} PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}")
+        endif()
+        target_link_libraries(${example} ${MPI_CXX_LIBRARIES})
+    endforeach(example)
     message(STATUS "    creating make targets to run MPI examples")
     foreach(example ${advec_mpi_examples})
         add_custom_target(run_example_advec_${example}