diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-04-08 18:15:06 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-04-08 18:15:06 (GMT) |
| commit | 2238e2269943e7ea20857fb13dcf0b679e0daf23 (patch) | |
| tree | 5e419a66ba90de113f4e878f968df1ffd1aca0af | |
| parent | 604ec6b7646dfe68c334d3288835a6aa03a87417 (diff) | |
| download | CMake-2238e2269943e7ea20857fb13dcf0b679e0daf23.zip CMake-2238e2269943e7ea20857fb13dcf0b679e0daf23.tar.gz CMake-2238e2269943e7ea20857fb13dcf0b679e0daf23.tar.bz2 | |
ENH: make sure verbose output is used for kde
| -rw-r--r-- | Source/cmLocalKdevelopGenerator.cxx | 4 | ||||
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 3 | ||||
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.h | 1 |
3 files changed, 7 insertions, 1 deletions
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; |