diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2001-12-21 20:39:43 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2001-12-21 20:39:43 (GMT) |
| commit | 2c7bb2bf343f7c2614706c012ba4f751231802c3 (patch) | |
| tree | d3af198e66b956f52725af9412232557169641f1 /Source/cmNMakeMakefileGenerator.cxx | |
| parent | 65339be84a3e271ee0c2c4340e03f448d62a97f0 (diff) | |
| download | CMake-2c7bb2bf343f7c2614706c012ba4f751231802c3.zip CMake-2c7bb2bf343f7c2614706c012ba4f751231802c3.tar.gz CMake-2c7bb2bf343f7c2614706c012ba4f751231802c3.tar.bz2 | |
BUG: fix so you can remove a directory in the source tree, and clean up echo of commands
Diffstat (limited to 'Source/cmNMakeMakefileGenerator.cxx')
| -rw-r--r-- | Source/cmNMakeMakefileGenerator.cxx | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/Source/cmNMakeMakefileGenerator.cxx b/Source/cmNMakeMakefileGenerator.cxx index 5e56d2a..fca80a7 100644 --- a/Source/cmNMakeMakefileGenerator.cxx +++ b/Source/cmNMakeMakefileGenerator.cxx @@ -309,28 +309,40 @@ void cmNMakeMakefileGenerator::OutputMakeRule(std::ostream& fout, { replace = ShortPathCommand(command); m_Makefile->ExpandVariablesInString(replace); - fout << "\t" << "echo " << replace.c_str() << "\n"; + if(replace[0] != '-' && replace.find("echo") != 0) + { + fout << "\t" << "echo " << replace.c_str() << "\n"; + } fout << "\t" << replace.c_str() << "\n"; } if(command2) { replace = ShortPathCommand(command2); m_Makefile->ExpandVariablesInString(replace); - fout << "\t" << "echo " << replace.c_str() << "\n"; + if(replace[0] != '-' && replace.find("echo") != 0) + { + fout << "\t" << "echo " << replace.c_str() << "\n"; + } fout << "\t" << replace.c_str() << "\n"; } if(command3) { replace = ShortPathCommand(command3); m_Makefile->ExpandVariablesInString(replace); - fout << "\t" << "echo " << replace.c_str() << "\n"; + if(replace[0] != '-' && replace.find("echo") != 0) + { + fout << "\t" << "echo " << replace.c_str() << "\n"; + } fout << "\t" << replace.c_str() << "\n"; } if(command4) { replace = ShortPathCommand(command4); m_Makefile->ExpandVariablesInString(replace); - fout << "\t" << "echo " << replace.c_str() << "\n"; + if(replace[0] != '-' && replace.find("echo") != 0) + { + fout << "\t" << "echo " << replace.c_str() << "\n"; + } fout << "\t" << replace.c_str() << "\n"; } fout << "\n"; |