diff options
| author | Brad King <brad.king@kitware.com> | 2003-08-26 21:13:43 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2003-08-26 21:13:43 (GMT) |
| commit | a381efce422b17abf407b9b4eb0842ecbe537e0e (patch) | |
| tree | 766ed324d1b44e2a126084c43b9c08888f89e7ef | |
| parent | 41445f67aca14217f5e786b25ed5665b26d45ca8 (diff) | |
| download | CMake-a381efce422b17abf407b9b4eb0842ecbe537e0e.zip CMake-a381efce422b17abf407b9b4eb0842ecbe537e0e.tar.gz CMake-a381efce422b17abf407b9b4eb0842ecbe537e0e.tar.bz2 | |
ENH: Added support for "make VERBOSE=1" to run one-time verbose make runs without changing CMAKE_VERBOSE_MAKEFILE.
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator.cxx b/Source/cmLocalUnixMakefileGenerator.cxx index 68e9834..b596b80 100644 --- a/Source/cmLocalUnixMakefileGenerator.cxx +++ b/Source/cmLocalUnixMakefileGenerator.cxx @@ -212,11 +212,6 @@ void cmLocalUnixMakefileGenerator::OutputMakefile(const char* file, fout << "# " << i->c_str() << "\n"; } fout << "\n\n"; - if(!m_Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE")) - { - fout << "# Suppresses display of executed commands\n"; - fout << ".SILENT:\n"; - } fout << "# disable some common implicit rules to speed things up\n"; fout << ".SUFFIXES:\n"; fout << ".SUFFIXES:.hpuxmakemusthaverule\n"; @@ -248,6 +243,13 @@ void cmLocalUnixMakefileGenerator::OutputMakefile(const char* file, "$(MAKE) $(MAKESILENT) -f cmake.check_depends", "$(MAKE) $(MAKESILENT) all"); + // Generation of SILENT target must be after default_target. + if(!m_Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE")) + { + fout << "# Suppresses display of executed commands\n"; + fout << "$(VERBOSE).SILENT:\n\n"; + } + this->OutputTargetRules(fout); this->OutputDependLibs(fout); this->OutputTargets(fout); |