diff options
author | Brad King <brad.king@kitware.com> | 2009-09-07 14:11:20 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2009-09-07 14:11:20 (GMT) |
commit | 355511ade9fd1be71835359a9b085586446e50c2 (patch) | |
tree | 9f414f4b3c4e45a93ae9e2eb9b859638b4d3d282 /Source/cmLocalVisualStudioGenerator.cxx | |
parent | f143dc2af2c65dcac3434fd531794a79e313ec01 (diff) | |
download | CMake-355511ade9fd1be71835359a9b085586446e50c2.zip CMake-355511ade9fd1be71835359a9b085586446e50c2.tar.gz CMake-355511ade9fd1be71835359a9b085586446e50c2.tar.bz2 |
Do Windows command line escapes for VS 10 too
Until now the VS 10 generator did no Windows command-line escaping and
just did XML escapes. This commit teaches the generator to use the same
command-line escape addition code used by other generators. The script
construction method cmLocalVisualStudioGenerator::ConstructScript need
not do XML escapes. Each VS generator version adds the XML escapes
necessary for that version.
Diffstat (limited to 'Source/cmLocalVisualStudioGenerator.cxx')
-rw-r--r-- | Source/cmLocalVisualStudioGenerator.cxx | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx index da214cf..4706a96 100644 --- a/Source/cmLocalVisualStudioGenerator.cxx +++ b/Source/cmLocalVisualStudioGenerator.cxx @@ -26,7 +26,6 @@ cmLocalVisualStudioGenerator::cmLocalVisualStudioGenerator() { this->WindowsShell = true; this->WindowsVSIDE = true; - this->NeedXMLEscape = false; } //---------------------------------------------------------------------------- @@ -232,26 +231,8 @@ cmLocalVisualStudioGenerator } else { - if(this->NeedXMLEscape) - { - std::string arg = commandLine[j]; - cmSystemTools::ReplaceString(arg, "&", "&"); - cmSystemTools::ReplaceString(arg, "<", "<"); - cmSystemTools::ReplaceString(arg, ">", ">"); - if(arg.find(" ") != arg.npos) - { - std::string q("\""); - arg = q + arg +q; - } - script += arg; - //script += this->EscapeForShell(arg.c_str(), - //escapeAllowMakeVars); - } - else - { - script += this->EscapeForShell(commandLine[j].c_str(), + script += this->EscapeForShell(commandLine[j].c_str(), escapeAllowMakeVars); - } } } } |