diff --git a/Source/cmLocalKdevelopGenerator.cxx b/Source/cmLocalKdevelopGenerator.cxx index b484f573d..db3fb4177 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 2068fce36..303470f31 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 commands; std::vector 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 69e490050..c96ca0056 100644 --- a/Source/cmLocalUnixMakefileGenerator3.h +++ b/Source/cmLocalUnixMakefileGenerator3.h @@ -279,6 +279,7 @@ protected: const std::vector& files, cmTarget& target, const char* filename =0); + bool ForceVerboseMakefiles; private: friend class cmMakefileTargetGenerator; friend class cmMakefileExecutableTargetGenerator;