diff options
author | Brad King <brad.king@kitware.com> | 2011-06-16 19:43:17 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2011-06-16 19:43:17 (GMT) |
commit | 6b4d3ad32a93b4bedbc76c03cbf088cf31138163 (patch) | |
tree | ceafca66c69a8b73b3e610c8efe43bd065067e41 /Source/cmLocalUnixMakefileGenerator3.cxx | |
parent | 0751106f2fbfd1a5eb8c4572f60209cc9b22f841 (diff) | |
download | CMake-6b4d3ad32a93b4bedbc76c03cbf088cf31138163.zip CMake-6b4d3ad32a93b4bedbc76c03cbf088cf31138163.tar.gz CMake-6b4d3ad32a93b4bedbc76c03cbf088cf31138163.tar.bz2 |
MinGW: Remove old workaround and use native echo (#12283)
The workaround added by commit 7e92f0b4 (Hack to make echo command work
properly in mingw32-make, 2006-10-05) and updated by commit 69356d8a
(Juse use cmake -E echo instead of the native echo, 2006-10-13) no
longer seems necessary with modern mingw32-make. Furthermore it slows
performance due to the time spent loading a cmake process instead of
plain echo.
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
-rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 5c2cda1..6ab5c2a 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -68,8 +68,6 @@ cmLocalUnixMakefileGenerator3::cmLocalUnixMakefileGenerator3() this->ColorMakefile = false; this->SkipPreprocessedSourceRules = false; this->SkipAssemblySourceRules = false; - this->NativeEchoCommand = "@echo "; - this->NativeEchoWindows = true; this->MakeCommandEscapeTargetTwice = false; this->IsMakefileGenerator = true; this->BorlandMakeCurlyHack = false; @@ -1235,9 +1233,8 @@ cmLocalUnixMakefileGenerator3::AppendEcho(std::vector<std::string>& commands, if(color_name.empty()) { // Use the native echo command. - cmd = this->NativeEchoCommand; - cmd += this->EscapeForShell(line.c_str(), false, - this->NativeEchoWindows); + cmd = "@echo "; + cmd += this->EscapeForShell(line.c_str(), false, true); } else { |