kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Bill Hoffman 2003-08-07 09:19:39 -04:00
parent d0b3391642
commit 4a1412b0cb
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/FindMPI.cmake
View File

@ -10,15 +10,20 @@ FIND_PATH(MPI_INCLUDE_PATH mpi.h
/usr/local/include /usr/local/include
/usr/include /usr/include
/usr/include/mpi /usr/include/mpi
/usr/local/mpi/include) /usr/local/mpi/include
"C:/Program Files/MPICH/SDK/Include"
)
FIND_LIBRARY(MPI_LIBRARY FIND_LIBRARY(MPI_LIBRARY
NAMES mpi mpich 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 FIND_LIBRARY(MPI_EXTRA_LIBRARY
NAMES mpi++ NAMES mpi++
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"
DOC "If a second mpi library is necessary, specify it here.") DOC "If a second mpi library is necessary, specify it here.")
MARK_AS_ADVANCED(MPI_INCLUDE_PATH MPI_LIBRARY MPI_EXTRA_LIBRARY) MARK_AS_ADVANCED(MPI_INCLUDE_PATH MPI_LIBRARY MPI_EXTRA_LIBRARY)

4
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -1021,8 +1021,8 @@ void cmLocalVisualStudio7Generator::WriteVCProjFooter(std::ostream& fout)
std::string cmLocalVisualStudio7Generator::EscapeForXML(const char* s) std::string cmLocalVisualStudio7Generator::EscapeForXML(const char* s)
{ {
std::string ret = s; std::string ret = s;
cmSystemTools::ReplaceString(ret, "\"", """);
cmSystemTools::ReplaceString(ret, "&", "&"); cmSystemTools::ReplaceString(ret, "&", "&");
cmSystemTools::ReplaceString(ret, "\"", """);
cmSystemTools::ReplaceString(ret, "<", "&lt;"); cmSystemTools::ReplaceString(ret, "<", "&lt;");
cmSystemTools::ReplaceString(ret, ">", "&gt;"); cmSystemTools::ReplaceString(ret, ">", "&gt;");
return ret; return ret;
@ -1031,8 +1031,8 @@ std::string cmLocalVisualStudio7Generator::EscapeForXML(const char* s)
std::string cmLocalVisualStudio7Generator::ConvertToXMLOutputPath(const char* path) std::string cmLocalVisualStudio7Generator::ConvertToXMLOutputPath(const char* path)
{ {
std::string ret = cmSystemTools::ConvertToOutputPath(path); std::string ret = cmSystemTools::ConvertToOutputPath(path);
cmSystemTools::ReplaceString(ret, "\"", "&quot;");
cmSystemTools::ReplaceString(ret, "&", "&amp;"); cmSystemTools::ReplaceString(ret, "&", "&amp;");
cmSystemTools::ReplaceString(ret, "\"", "&quot;");
cmSystemTools::ReplaceString(ret, "<", "&lt;"); cmSystemTools::ReplaceString(ret, "<", "&lt;");
cmSystemTools::ReplaceString(ret, ">", "&gt;"); cmSystemTools::ReplaceString(ret, ">", "&gt;");
return ret; return ret;