BUG: fix for bugs 125 - 128, and a fix for the bug introduced by the bug fix for but 92. & was being replaced with &amp, but after double quote was replaced with &quot causing it to be &quot. Also add more search paths for mpi

2 files changed, 9 insertions, 4 deletions

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index ba27e7c..1f2013a 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -10,15 +10,20 @@ FIND_PATH(MPI_INCLUDE_PATH mpi.h
           /usr/local/include 
           /usr/include 
           /usr/include/mpi
-          /usr/local/mpi/include)
+          /usr/local/mpi/include
+          "C:/Program Files/MPICH/SDK/Include" 
+)
 
 FIND_LIBRARY(MPI_LIBRARY 
              NAMES mpi mpich
-             PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib)
+             PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
+             "C:/Program Files/MPICH/SDK/Lib" 
+)
 
 FIND_LIBRARY(MPI_EXTRA_LIBRARY 
              NAMES mpi++
              PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
+             "C:/Program Files/MPICH/SDK/Lib" 
 	     DOC "If a second mpi library is necessary, specify it here.")
 
 MARK_AS_ADVANCED(MPI_INCLUDE_PATH MPI_LIBRARY MPI_EXTRA_LIBRARY)
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 42b7632..991d43c 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1021,8 +1021,8 @@ void cmLocalVisualStudio7Generator::WriteVCProjFooter(std::ostream& fout)
 std::string cmLocalVisualStudio7Generator::EscapeForXML(const char* s)
 {
   std::string ret = s;
-  cmSystemTools::ReplaceString(ret, "\"", """);
   cmSystemTools::ReplaceString(ret, "&", "&");
+  cmSystemTools::ReplaceString(ret, "\"", """);
   cmSystemTools::ReplaceString(ret, "<", "&lt;");
   cmSystemTools::ReplaceString(ret, ">", "&gt;");
   return ret;
@@ -1031,8 +1031,8 @@ std::string cmLocalVisualStudio7Generator::EscapeForXML(const char* s)
 std::string cmLocalVisualStudio7Generator::ConvertToXMLOutputPath(const char* path)
 {
   std::string ret = cmSystemTools::ConvertToOutputPath(path);
-  cmSystemTools::ReplaceString(ret, "\"", "&quot;");
   cmSystemTools::ReplaceString(ret, "&", "&amp;");
+  cmSystemTools::ReplaceString(ret, "\"", "&quot;");
   cmSystemTools::ReplaceString(ret, "<", "&lt;");
   cmSystemTools::ReplaceString(ret, ">", "&gt;");
   return ret;