diff options
author | Sebastien Barre <sebastien.barre@kitware.com> | 2002-04-22 18:22:46 (GMT) |
---|---|---|
committer | Sebastien Barre <sebastien.barre@kitware.com> | 2002-04-22 18:22:46 (GMT) |
commit | d774cd7c2be90f55b6d198ab147776a4303ca703 (patch) | |
tree | 4d5924ea4bebc1ad6f88b716c6324e380e5a7a8c /Source/cmNMakeMakefileGenerator.cxx | |
parent | bf228b05c795adaa206f8ef9858068c54aeb44b3 (diff) | |
download | CMake-d774cd7c2be90f55b6d198ab147776a4303ca703.zip CMake-d774cd7c2be90f55b6d198ab147776a4303ca703.tar.gz CMake-d774cd7c2be90f55b6d198ab147776a4303ca703.tar.bz2 |
ENH: make CMake less verbose/precious
Diffstat (limited to 'Source/cmNMakeMakefileGenerator.cxx')
-rw-r--r-- | Source/cmNMakeMakefileGenerator.cxx | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/Source/cmNMakeMakefileGenerator.cxx b/Source/cmNMakeMakefileGenerator.cxx index d140fec..53828f8 100644 --- a/Source/cmNMakeMakefileGenerator.cxx +++ b/Source/cmNMakeMakefileGenerator.cxx @@ -225,23 +225,30 @@ void cmNMakeMakefileGenerator::OutputMakeVariables(std::ostream& fout) void cmNMakeMakefileGenerator::BuildInSubDirectory(std::ostream& fout, - const char* directory, - const char* target1, - const char* target2) + const char* directory, + const char* target1, + const char* target2, + bool silent) { if(target1) { std::string dir = this->ConvertToOutputPath(directory); fout << "\tif not exist \"" << dir << "\\$(NULL)\"" << " " - << "$(MAKE) $(MAKESILENT) rebuild_cache\n" - << "\techo Building " << target1 << " in directory " << directory << "\n" - << "\tcd " << dir << "\n" + << "$(MAKE) $(MAKESILENT) rebuild_cache\n"; + if (!silent) + { + fout << "\techo Building " << target1 << " in directory " << directory << "\n"; + } + fout << "\tcd " << dir << "\n" << "\t$(MAKE) -$(MAKEFLAGS) $(MAKESILENT) " << target1 << "\n"; } if(target2) { - fout << "\techo Building " << target2 << " in directory " << directory << "\n"; + if (!silent) + { + fout << "\techo Building " << target2 << " in directory " << directory << "\n"; + } fout << "\t$(MAKE) -$(MAKEFLAGS) $(MAKESILENT) " << target2 << "\n"; } std::string currentDir = m_Makefile->GetCurrentOutputDirectory(); |