summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalUnixMakefileGenerator3.cxx
diff options
context:
space:
mode:
authorAlexander Neundorf <neundorf@kde.org>2007-06-05 20:35:24 (GMT)
committerAlexander Neundorf <neundorf@kde.org>2007-06-05 20:35:24 (GMT)
commit179943bf14c2553d3a419bc1a80aca9017fdc287 (patch)
tree41bdd65e2b738472a75b746b40ac60c7181ddb80 /Source/cmLocalUnixMakefileGenerator3.cxx
parenteab5a4350d45fe228ad143cf481c52c26feacef3 (diff)
downloadCMake-179943bf14c2553d3a419bc1a80aca9017fdc287.zip
CMake-179943bf14c2553d3a419bc1a80aca9017fdc287.tar.gz
CMake-179943bf14c2553d3a419bc1a80aca9017fdc287.tar.bz2
STYLE: move ForceVerboseMakefiles to cmGlobalUnixMakefileGenerator3, so the
kdevelop generator doesn't need its own CreateLocalGenerator() anymore Alex
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index bd8949d..e60a5d2 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -47,7 +47,6 @@ cmLocalUnixMakefileGenerator3::cmLocalUnixMakefileGenerator3()
this->PassMakeflags = false;
this->DefineWindowsNULL = false;
this->UnixCD = true;
- this->ForceVerboseMakefiles=false;
this->ColorMakefile = false;
this->SkipPreprocessedSourceRules = false;
this->SkipAssemblySourceRules = false;
@@ -678,6 +677,8 @@ cmLocalUnixMakefileGenerator3
this->WriteMakeRule(makefileStream, 0,
".SUFFIXES", depends, no_commands, false);
+ cmGlobalUnixMakefileGenerator3* gg =
+ static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
// Write special target to silence make output. This must be after
// the default target in case VERBOSE is set (which changes the
// name). The setting of CMAKE_VERBOSE_MAKEFILE to ON will cause a
@@ -685,7 +686,7 @@ cmLocalUnixMakefileGenerator3
// name of this special target. This gives a make-time choice to
// the user.
if((this->Makefile->IsOn("CMAKE_VERBOSE_MAKEFILE"))
- || (this->ForceVerboseMakefiles))
+ || (gg->GetForceVerboseMakefiles()))
{
makefileStream
<< "# Produce verbose output by default.\n"
@@ -707,8 +708,6 @@ cmLocalUnixMakefileGenerator3
// Work-around for makes that drop rules that have no dependencies
// or commands.
- cmGlobalUnixMakefileGenerator3* gg =
- static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
std::string hack = gg->GetEmptyRuleHackDepends();
if(!hack.empty())
{