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

BUG#393: Adding XML escaping for additional per-source compile flags.

Browse Source
This commit is contained in:
Brad King 2003-11-21 14:13:49 -05:00
parent 7cf5aa9271
commit 6018ebdc85
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -343,7 +343,6 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
<< "\t\t\t\tName=\"VCCLCompilerTool\"\n" << "\t\t\t\tName=\"VCCLCompilerTool\"\n"
<< "\t\t\t\tAdditionalOptions=\""; << "\t\t\t\tAdditionalOptions=\"";
cmSystemTools::ReplaceString(flags, "\"", "&quot;");
// check the flags for the run time library flag options // check the flags for the run time library flag options
// if there is a match set the run time flag // if there is a match set the run time flag
if(flags.find("MTd") != flags.npos) if(flags.find("MTd") != flags.npos)
@ -382,7 +381,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
cmSystemTools::ReplaceString(flags, "/ML", ""); cmSystemTools::ReplaceString(flags, "/ML", "");
runtime = 4; runtime = 4;
} }
fout << flags; fout << this->EscapeForXML(flags.c_str()).c_str();
fout << " -DCMAKE_INTDIR=\\&quot;" << configName << "\\&quot;" fout << " -DCMAKE_INTDIR=\\&quot;" << configName << "\\&quot;"
<< "\"\n"; << "\"\n";
@ -885,7 +884,7 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
if(compileFlags.size()) if(compileFlags.size())
{ {
fout << "\t\t\t\t\tAdditionalOptions=\"" fout << "\t\t\t\t\tAdditionalOptions=\""
<< compileFlags << "\"\n"; << this->EscapeForXML(compileFlags.c_str()) << "\"\n";
} }
if(additionalDeps.length()) if(additionalDeps.length())
{ {
@ -936,7 +935,7 @@ WriteCustomRule(std::ostream& fout,
fout << "\t\t\t\t\t<Tool\n" fout << "\t\t\t\t\t<Tool\n"
<< "\t\t\t\t\tName=\"VCCLCompilerTool\"\n" << "\t\t\t\t\tName=\"VCCLCompilerTool\"\n"
<< "\t\t\t\t\tAdditionalOptions=\"" << "\t\t\t\t\tAdditionalOptions=\""
<< compileFlags << "\"/>\n"; << this->EscapeForXML(compileFlags) << "\"/>\n";
} }
fout << "\t\t\t\t\t<Tool\n" fout << "\t\t\t\t\t<Tool\n"
<< "\t\t\t\t\tName=\"VCCustomBuildTool\"\n" << "\t\t\t\t\tName=\"VCCustomBuildTool\"\n"