Browse Source

ENH: Added support for "make VERBOSE=1" to run one-time verbose make runs without changing CMAKE_VERBOSE_MAKEFILE.

Brad King 22 years ago
parent
commit
a381efce42
1 changed files with 7 additions and 5 deletions
  1. 7 5
      Source/cmLocalUnixMakefileGenerator.cxx

+ 7 - 5
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);