summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Source/cmExtraCodeBlocksGenerator.cxx4
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.cxx1
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.h11
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.cxx3
4 files changed, 4 insertions, 15 deletions
diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 822d62a..191ad2c 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -70,7 +70,6 @@ void cmExtraCodeBlocksGenerator::SetGlobalGenerator(
cmGlobalUnixMakefileGenerator3* mf = (cmGlobalUnixMakefileGenerator3*)
generator;
mf->SetToolSupportsColor(false);
- mf->SetForceVerboseMakefiles(true);
}
void cmExtraCodeBlocksGenerator::Generate()
@@ -695,6 +694,7 @@ std::string cmExtraCodeBlocksGenerator::BuildMakeCommand(
command += " /NOLOGO /f "";
command += makefileName;
command += "" ";
+ command += " VERBOSE=1 ";
command += target;
}
else if (strcmp(this->GlobalGenerator->GetName(), "MinGW Makefiles")==0)
@@ -705,6 +705,7 @@ std::string cmExtraCodeBlocksGenerator::BuildMakeCommand(
command += " -f "";
command += makefileName;
command += "" ";
+ command += " VERBOSE=1 ";
command += target;
}
else
@@ -713,6 +714,7 @@ std::string cmExtraCodeBlocksGenerator::BuildMakeCommand(
command += " -f "";
command += makefileName;
command += "" ";
+ command += " VERBOSE=1 ";
command += target;
}
return command;
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 0f2c5f9..d9a341c 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -24,7 +24,6 @@ cmGlobalUnixMakefileGenerator3::cmGlobalUnixMakefileGenerator3()
this->ForceUnixPaths = true;
this->FindMakeProgramFile = "CMakeUnixFindMake.cmake";
this->ToolSupportsColor = true;
- this->ForceVerboseMakefiles = false;
this->NoRuleMessages = false;
#if defined(_WIN32) || defined(__VMS)
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index a36fb58..cdc9460 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -112,16 +112,6 @@ public:
/** Record per-target progress information. */
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:
void WriteMainMakefile2();
void WriteMainCMakefile();
@@ -169,7 +159,6 @@ protected:
// in the rule to satisfy the make program.
std::string EmptyRuleHackCommand;
- bool ForceVerboseMakefiles;
bool NoRuleMessages;
// Store per-target progress counters.
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 51566e0..c5d8c0d 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -722,8 +722,7 @@ cmLocalUnixMakefileGenerator3
// "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
// the user.
- if((this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE"))
- || (gg->GetForceVerboseMakefiles()))
+ if(this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE"))
{
makefileStream
<< "# Produce verbose output by default.\n"