ENH: make sure verbose output is used for kde
This commit is contained in:
parent
604ec6b764
commit
2238e22699
|
@ -29,6 +29,10 @@
|
||||||
cmLocalKdevelopGenerator::cmLocalKdevelopGenerator()
|
cmLocalKdevelopGenerator::cmLocalKdevelopGenerator()
|
||||||
:cmLocalUnixMakefileGenerator3()
|
: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()
|
cmLocalKdevelopGenerator::~cmLocalKdevelopGenerator()
|
||||||
|
|
|
@ -69,6 +69,7 @@ cmLocalUnixMakefileGenerator3::cmLocalUnixMakefileGenerator3()
|
||||||
this->EchoNeedsQuote = true;
|
this->EchoNeedsQuote = true;
|
||||||
this->DefineWindowsNULL = false;
|
this->DefineWindowsNULL = false;
|
||||||
this->UnixCD = true;
|
this->UnixCD = true;
|
||||||
|
this->ForceVerboseMakefiles=false;
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
|
@ -599,7 +600,7 @@ cmLocalUnixMakefileGenerator3
|
||||||
std::vector<std::string> commands;
|
std::vector<std::string> commands;
|
||||||
std::vector<std::string> no_depends;
|
std::vector<std::string> no_depends;
|
||||||
commands.clear();
|
commands.clear();
|
||||||
if(this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE"))
|
if((this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE")) || (this->ForceVerboseMakefiles))
|
||||||
{
|
{
|
||||||
makefileStream
|
makefileStream
|
||||||
<< "# Produce verbose output by default.\n"
|
<< "# Produce verbose output by default.\n"
|
||||||
|
|
|
@ -279,6 +279,7 @@ protected:
|
||||||
const std::vector<std::string>& files,
|
const std::vector<std::string>& files,
|
||||||
cmTarget& target, const char* filename =0);
|
cmTarget& target, const char* filename =0);
|
||||||
|
|
||||||
|
bool ForceVerboseMakefiles;
|
||||||
private:
|
private:
|
||||||
friend class cmMakefileTargetGenerator;
|
friend class cmMakefileTargetGenerator;
|
||||||
friend class cmMakefileExecutableTargetGenerator;
|
friend class cmMakefileExecutableTargetGenerator;
|
||||||
|
|
Loading…
Reference in New Issue