ENH: Added support for "make VERBOSE=1" to run one-time verbose make runs without changing CMAKE_VERBOSE_MAKEFILE.
This commit is contained in:
parent
41445f67ac
commit
a381efce42
@ -212,11 +212,6 @@ void cmLocalUnixMakefileGenerator::OutputMakefile(const char* file,
|
|||||||
fout << "# " << i->c_str() << "\n";
|
fout << "# " << i->c_str() << "\n";
|
||||||
}
|
}
|
||||||
fout << "\n\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 << "# disable some common implicit rules to speed things up\n";
|
||||||
fout << ".SUFFIXES:\n";
|
fout << ".SUFFIXES:\n";
|
||||||
fout << ".SUFFIXES:.hpuxmakemusthaverule\n";
|
fout << ".SUFFIXES:.hpuxmakemusthaverule\n";
|
||||||
@ -248,6 +243,13 @@ void cmLocalUnixMakefileGenerator::OutputMakefile(const char* file,
|
|||||||
"$(MAKE) $(MAKESILENT) -f cmake.check_depends",
|
"$(MAKE) $(MAKESILENT) -f cmake.check_depends",
|
||||||
"$(MAKE) $(MAKESILENT) all");
|
"$(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->OutputTargetRules(fout);
|
||||||
this->OutputDependLibs(fout);
|
this->OutputDependLibs(fout);
|
||||||
this->OutputTargets(fout);
|
this->OutputTargets(fout);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user