diff options
| author | Brad King <brad.king@kitware.com> | 2003-11-21 19:13:49 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2003-11-21 19:13:49 (GMT) |
| commit | 6018ebdc8558573aa307334f3b6d9a91aa3be533 (patch) | |
| tree | 11eef21237695e852c439bbdedd1a13ea1a7f532 | |
| parent | 7cf5aa927176d1dee2606ef6ebf810f437104810 (diff) | |
| download | CMake-6018ebdc8558573aa307334f3b6d9a91aa3be533.zip CMake-6018ebdc8558573aa307334f3b6d9a91aa3be533.tar.gz CMake-6018ebdc8558573aa307334f3b6d9a91aa3be533.tar.bz2 | |
BUG#393: Adding XML escaping for additional per-source compile flags.
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 22da7d8..5927cea 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -343,7 +343,6 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout, << "\t\t\t\tName=\"VCCLCompilerTool\"\n" << "\t\t\t\tAdditionalOptions=\""; - cmSystemTools::ReplaceString(flags, "\"", """); // check the flags for the run time library flag options // if there is a match set the run time flag if(flags.find("MTd") != flags.npos) @@ -382,7 +381,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout, cmSystemTools::ReplaceString(flags, "/ML", ""); runtime = 4; } - fout << flags; + fout << this->EscapeForXML(flags.c_str()).c_str(); fout << " -DCMAKE_INTDIR=\\"" << configName << "\\"" << "\"\n"; @@ -885,7 +884,7 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout, if(compileFlags.size()) { fout << "\t\t\t\t\tAdditionalOptions=\"" - << compileFlags << "\"\n"; + << this->EscapeForXML(compileFlags.c_str()) << "\"\n"; } if(additionalDeps.length()) { @@ -936,7 +935,7 @@ WriteCustomRule(std::ostream& fout, fout << "\t\t\t\t\t<Tool\n" << "\t\t\t\t\tName=\"VCCLCompilerTool\"\n" << "\t\t\t\t\tAdditionalOptions=\"" - << compileFlags << "\"/>\n"; + << this->EscapeForXML(compileFlags) << "\"/>\n"; } fout << "\t\t\t\t\t<Tool\n" << "\t\t\t\t\tName=\"VCCustomBuildTool\"\n" |