Browse Source

ENH: make sure verbose output is used for kde

Bill Hoffman 19 years ago
parent
commit
2238e22699

+ 4 - 0
Source/cmLocalKdevelopGenerator.cxx

@@ -29,6 +29,10 @@
 cmLocalKdevelopGenerator::cmLocalKdevelopGenerator()
   :cmLocalUnixMakefileGenerator3()
 {
+   // KDevelop can itself shorten the output, so it should
+   // always get the full output, otherwise the "full output"
+   // option in kdevelop doesn't make much sense, Alex
+   this->ForceVerboseMakefiles=true;
 }
 
 cmLocalKdevelopGenerator::~cmLocalKdevelopGenerator()

+ 2 - 1
Source/cmLocalUnixMakefileGenerator3.cxx

@@ -69,6 +69,7 @@ cmLocalUnixMakefileGenerator3::cmLocalUnixMakefileGenerator3()
   this->EchoNeedsQuote = true;
   this->DefineWindowsNULL = false;
   this->UnixCD = true;
+  this->ForceVerboseMakefiles=false;
 }
 
 //----------------------------------------------------------------------------
@@ -599,7 +600,7 @@ cmLocalUnixMakefileGenerator3
   std::vector<std::string> commands;
   std::vector<std::string> no_depends;
   commands.clear();
-  if(this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE"))
+  if((this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE")) || (this->ForceVerboseMakefiles))
     {
     makefileStream
       << "# Produce verbose output by default.\n"

+ 1 - 0
Source/cmLocalUnixMakefileGenerator3.h

@@ -279,6 +279,7 @@ protected:
                           const std::vector<std::string>& files,
                           cmTarget& target, const char* filename =0);
 
+  bool ForceVerboseMakefiles;
 private:
   friend class cmMakefileTargetGenerator;
   friend class cmMakefileExecutableTargetGenerator;