From 2238e2269943e7ea20857fb13dcf0b679e0daf23 Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Sat, 8 Apr 2006 14:15:06 -0400
Subject: ENH: make sure verbose output is used for kde

---
 Source/cmLocalKdevelopGenerator.cxx      | 4 ++++
 Source/cmLocalUnixMakefileGenerator3.cxx | 3 ++-
 Source/cmLocalUnixMakefileGenerator3.h   | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Source/cmLocalKdevelopGenerator.cxx b/Source/cmLocalKdevelopGenerator.cxx
index b484f57..db3fb41 100644
--- a/Source/cmLocalKdevelopGenerator.cxx
+++ b/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()
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 2068fce..303470f 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/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"
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index 69e4900..c96ca00 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/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;
-- 
cgit v0.12