From 4a1412b0cb0af4d0e6c58f4555f69f9693af0581 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Thu, 7 Aug 2003 09:19:39 -0400 Subject: [PATCH] BUG: fix for bugs 125 - 128, and a fix for the bug introduced by the bug fix for but 92. & was being replaced with &, but after double quote was replaced with " causing it to be &quot. Also add more search paths for mpi --- Modules/FindMPI.cmake | 9 +++++++-- Source/cmLocalVisualStudio7Generator.cxx | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake index ba27e7c1d..1f2013a78 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 42b7632b5..991d43cb2 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, "<", "<"); cmSystemTools::ReplaceString(ret, ">", ">"); 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, "\"", """); cmSystemTools::ReplaceString(ret, "&", "&"); + cmSystemTools::ReplaceString(ret, "\"", """); cmSystemTools::ReplaceString(ret, "<", "<"); cmSystemTools::ReplaceString(ret, ">", ">"); return ret;