kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't enforce VERBOSE makefiles for the CodeBlocks generator

Browse Source 
Instead of enforcing verbose makefile, now the generated build command
includes "VERBOSE=1" so the output will be verbose when building in
C::B.
Also removed the now unused setForceVerboseMakefiles().

Alex
This commit is contained in:
Alex Neundorf 2010-11-11 22:06:09 +01:00
parent 7b1421b885
commit a02987a0df
4 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmExtraCodeBlocksGenerator.cxx
View File

@ -70,7 +70,6 @@ void cmExtraCodeBlocksGenerator::SetGlobalGenerator(
cmGlobalUnixMakefileGenerator3* mf = (cmGlobalUnixMakefileGenerator3*) cmGlobalUnixMakefileGenerator3* mf = (cmGlobalUnixMakefileGenerator3*)
generator; generator;
mf->SetToolSupportsColor(false); mf->SetToolSupportsColor(false);
mf->SetForceVerboseMakefiles(true);
} }
void cmExtraCodeBlocksGenerator::Generate() void cmExtraCodeBlocksGenerator::Generate()
@ -695,6 +694,7 @@ std::string cmExtraCodeBlocksGenerator::BuildMakeCommand(
command += " /NOLOGO /f ""; command += " /NOLOGO /f "";
command += makefileName; command += makefileName;
command += "" "; command += "" ";
command += " VERBOSE=1 ";
command += target; command += target;
} }
else if (strcmp(this->GlobalGenerator->GetName(), "MinGW Makefiles")==0) else if (strcmp(this->GlobalGenerator->GetName(), "MinGW Makefiles")==0)
@ -705,6 +705,7 @@ std::string cmExtraCodeBlocksGenerator::BuildMakeCommand(
command += " -f ""; command += " -f "";
command += makefileName; command += makefileName;
command += "" "; command += "" ";
command += " VERBOSE=1 ";
command += target; command += target;
} }
else else
@ -713,6 +714,7 @@ std::string cmExtraCodeBlocksGenerator::BuildMakeCommand(
command += " -f ""; command += " -f "";
command += makefileName; command += makefileName;
command += "" "; command += "" ";
command += " VERBOSE=1 ";
command += target; command += target;
} }
return command; return command;

1
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

@ -24,7 +24,6 @@ cmGlobalUnixMakefileGenerator3::cmGlobalUnixMakefileGenerator3()
this->ForceUnixPaths = true; this->ForceUnixPaths = true;
this->FindMakeProgramFile = "CMakeUnixFindMake.cmake"; this->FindMakeProgramFile = "CMakeUnixFindMake.cmake";
this->ToolSupportsColor = true; this->ToolSupportsColor = true;
this->ForceVerboseMakefiles = false;
this->NoRuleMessages = false; this->NoRuleMessages = false;
#if defined(_WIN32) || defined(__VMS) #if defined(_WIN32) || defined(__VMS)

11
Source/cmGlobalUnixMakefileGenerator3.h
View File

@ -112,16 +112,6 @@ public:
/** Record per-target progress information. */ /** Record per-target progress information. */
void RecordTargetProgress(cmMakefileTargetGenerator* tg); void RecordTargetProgress(cmMakefileTargetGenerator* tg);
/**
* If true, the CMake variable CMAKE_VERBOSE_MAKEFILES doesn't have effect
* anymore. Set it to true when writing a generator where short output
* doesn't make sense, e.g. because the full output is parsed by an
* IDE/editor.
*/
bool GetForceVerboseMakefiles() { return this->ForceVerboseMakefiles; }
void SetForceVerboseMakefiles(bool enable)
{this->ForceVerboseMakefiles=enable;}
protected: protected:
void WriteMainMakefile2(); void WriteMainMakefile2();
void WriteMainCMakefile(); void WriteMainCMakefile();
@ -169,7 +159,6 @@ protected:
// in the rule to satisfy the make program. // in the rule to satisfy the make program.
std::string EmptyRuleHackCommand; std::string EmptyRuleHackCommand;
bool ForceVerboseMakefiles;
bool NoRuleMessages; bool NoRuleMessages;
// Store per-target progress counters. // Store per-target progress counters.

3
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -722,8 +722,7 @@ cmLocalUnixMakefileGenerator3
// "VERBOSE=1" to be added as a make variable which will change the // "VERBOSE=1" to be added as a make variable which will change the
// name of this special target. This gives a make-time choice to // name of this special target. This gives a make-time choice to
// the user. // the user.
if((this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE")) if(this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE"))
|| (gg->GetForceVerboseMakefiles()))
{ {
makefileStream makefileStream
<< "# Produce verbose output by default.\n" << "# Produce verbose output by default.\n"