mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-02 12:19:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

BUG: Fixed display of custom command comments with quotes, dollars, and other special characters in them.

Browse Source
This commit is contained in:
Brad King
2006-10-04 18:52:29 -04:00
parent 038c9e27d7
commit 406f3554c7
7 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmLocalUnixMakefileGenerator3.cxx
+2 -13
View File
@@ -44,7 +44,6 @@ cmLocalUnixMakefileGenerator3::cmLocalUnixMakefileGenerator3()
this->MakefileVariableSize = 0;
this->IgnoreLibPrefix = false;
this->PassMakeflags = false;
this->EchoNeedsQuote = true;
this->DefineWindowsNULL = false;
this->UnixCD = true;
this->ForceVerboseMakefiles=false;
@@ -1046,24 +1045,14 @@ cmLocalUnixMakefileGenerator3::AppendEcho(std::vector<std::string>& commands,
{
// Use the native echo command.
cmd = "@echo ";
if(this->EchoNeedsQuote)
{
cmd += "\"";
}
cmd += line;
if(this->EchoNeedsQuote)
{
cmd += "\"";
}
cmd += this->EscapeForShell(line.c_str(), false, true);
}
else
{
// Use cmake to echo the text in color.
cmd = "@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) ";
cmd += color_name;
cmd += "\"";
cmd += line;
cmd += "\"";
cmd += this->EscapeForShell(line.c_str());
}
commands.push_back(cmd);
}