--- C:/Program Files (x86)/CMake 2.8/share/cmake-2.8/Modules/FindMPI-2.8.6.cmake	Tue Oct  4 10:01:34 2011
+++ C:/Program Files (x86)/CMake 2.8/share/cmake-2.8/Modules/FindMPI.cmake	Wed Nov  2 13:18:52 2011
@@ -291,7 +291,7 @@
       # If interrogation came back with something, extract our variable from the MPI command line
       if (MPI_COMPILE_CMDLINE OR MPI_LINK_CMDLINE)
         # Extract compile flags from the compile command line.
-        string(REGEX MATCHALL "(^| )-[Df]([^\" ]+|\"[^\"]+\")" MPI_ALL_COMPILE_FLAGS "${MPI_COMPILE_CMDLINE}")
+        string(REGEX MATCHALL "(^| )-[Df]([^\" \n]+|\"[^\"]+\")" MPI_ALL_COMPILE_FLAGS "${MPI_COMPILE_CMDLINE}")
         set(MPI_COMPILE_FLAGS_WORK)
 
         foreach(FLAG ${MPI_ALL_COMPILE_FLAGS})
@@ -303,7 +303,7 @@
         endforeach()
 
         # Extract include paths from compile command line
-        string(REGEX MATCHALL "(^| )-I([^\" ]+|\"[^\"]+\")" MPI_ALL_INCLUDE_PATHS "${MPI_COMPILE_CMDLINE}")
+        string(REGEX MATCHALL "(^| )-I([^\" \n]+|\"[^\"]+\")" MPI_ALL_INCLUDE_PATHS "${MPI_COMPILE_CMDLINE}")
         foreach(IPATH ${MPI_ALL_INCLUDE_PATHS})
           string(REGEX REPLACE "^ ?-I" "" IPATH ${IPATH})
           string(REGEX REPLACE "//" "/" IPATH ${IPATH})
@@ -326,7 +326,7 @@
         endif()
 
         # Extract linker paths from the link command line
-        string(REGEX MATCHALL "(^| |-Wl,)-L([^\" ]+|\"[^\"]+\")" MPI_ALL_LINK_PATHS "${MPI_LINK_CMDLINE}")
+        string(REGEX MATCHALL "(^| |-Wl,)-L([^\" \n]+|\"[^\"]+\")" MPI_ALL_LINK_PATHS "${MPI_LINK_CMDLINE}")
         set(MPI_LINK_PATH)
         foreach(LPATH ${MPI_ALL_LINK_PATHS})
           string(REGEX REPLACE "^(| |-Wl,)-L" "" LPATH ${LPATH})
@@ -341,7 +341,7 @@
         endif()
 
         # Extract linker flags from the link command line
-        string(REGEX MATCHALL "(^| )-Wl,([^\" ]+|\"[^\"]+\")" MPI_ALL_LINK_FLAGS "${MPI_LINK_CMDLINE}")
+        string(REGEX MATCHALL "(^| )-Wl,([^\" \n]+|\"[^\"]+\")" MPI_ALL_LINK_FLAGS "${MPI_LINK_CMDLINE}")
         set(MPI_LINK_FLAGS_WORK)
         foreach(FLAG ${MPI_ALL_LINK_FLAGS})
           if (MPI_LINK_FLAGS_WORK)
@@ -353,7 +353,7 @@
 
         # Extract the set of libraries to link against from the link command
         # line
-        string(REGEX MATCHALL "(^| )-l([^\" ]+|\"[^\"]+\")" MPI_LIBNAMES "${MPI_LINK_CMDLINE}")
+        string(REGEX MATCHALL "(^| )-l([^\" \n]+|\"[^\"]+\")" MPI_LIBNAMES "${MPI_LINK_CMDLINE}")
 
         # Determine full path names for all of the libraries that one needs
         # to link against in an MPI program