[cmake-commits] alex committed cmGlobalKdevelopGenerator.cxx 1.21
1.22 cmGlobalKdevelopGenerator.h 1.4 1.5
cmGlobalUnixMakefileGenerator3.cxx 1.107 1.108
cmGlobalUnixMakefileGenerator3.h 1.41 1.42
cmLocalUnixMakefileGenerator3.cxx 1.211 1.212
cmLocalUnixMakefileGenerator3.h 1.71 1.72
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Jun 5 16:35:26 EDT 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv531/Source
Modified Files:
cmGlobalKdevelopGenerator.cxx cmGlobalKdevelopGenerator.h
cmGlobalUnixMakefileGenerator3.cxx
cmGlobalUnixMakefileGenerator3.h
cmLocalUnixMakefileGenerator3.cxx
cmLocalUnixMakefileGenerator3.h
Log Message:
STYLE: move ForceVerboseMakefiles to cmGlobalUnixMakefileGenerator3, so the
kdevelop generator doesn't need its own CreateLocalGenerator() anymore
Alex
Index: cmLocalUnixMakefileGenerator3.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- cmLocalUnixMakefileGenerator3.h 17 May 2007 14:53:17 -0000 1.71
+++ cmLocalUnixMakefileGenerator3.h 5 Jun 2007 20:35:24 -0000 1.72
@@ -129,15 +129,6 @@
void SetSilentNoColon(bool v) {this->SilentNoColon = v;}
/**
- * If set to true, the CMake variable CMAKE_VERBOSE_MAKEFILES doesn't have
- * 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.
- */
- void SetForceVerboseMakefiles(bool enable)
- {this->ForceVerboseMakefiles=enable;}
-
- /**
* Set the command to use for native make shell echo. The value
* should include all parts of the command up to the beginning of
* the message (including a whitespace separator).
@@ -325,7 +316,6 @@
const std::vector<std::string>& files,
cmTarget& target, const char* filename =0);
- bool ForceVerboseMakefiles;
std::map<cmStdString, std::vector<int> > ProgressFiles;
private:
Index: cmGlobalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalUnixMakefileGenerator3.cxx,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- cmGlobalUnixMakefileGenerator3.cxx 22 May 2007 14:24:59 -0000 1.107
+++ cmGlobalUnixMakefileGenerator3.cxx 5 Jun 2007 20:35:24 -0000 1.108
@@ -29,6 +29,8 @@
this->ForceUnixPaths = true;
this->FindMakeProgramFile = "CMakeUnixFindMake.cmake";
this->ToolSupportsColor = true;
+ this->ForceVerboseMakefiles = false;
+
#ifdef _WIN32
this->UseLinkScript = false;
#else
Index: cmGlobalKdevelopGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalKdevelopGenerator.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cmGlobalKdevelopGenerator.h 18 Feb 2006 16:03:36 -0000 1.4
+++ cmGlobalKdevelopGenerator.h 5 Jun 2007 20:35:24 -0000 1.5
@@ -45,9 +45,6 @@
/** Get the documentation entry for this generator. */
virtual void GetDocumentation(cmDocumentationEntry& entry) const;
- ///! Create a local generator appropriate to this Global Generator
- virtual cmLocalGenerator *CreateLocalGenerator();
-
/**
* Generate the all required files for building this project/tree. This
* basically creates a series of LocalGenerators for each directory and
Index: cmGlobalUnixMakefileGenerator3.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalUnixMakefileGenerator3.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- cmGlobalUnixMakefileGenerator3.h 18 May 2007 17:43:39 -0000 1.41
+++ cmGlobalUnixMakefileGenerator3.h 5 Jun 2007 20:35:24 -0000 1.42
@@ -132,6 +132,17 @@
unsigned long GetNumberOfProgressActionsInAll
(cmLocalUnixMakefileGenerator3 *lg);
+ /** Get whether the generator should use a script for link commands. */
+ bool GetForceVerboseMakefiles() { return this->ForceVerboseMakefiles; }
+ /**
+ * If set to true, the CMake variable CMAKE_VERBOSE_MAKEFILES doesn't have
+ * 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.
+ */
+ void SetForceVerboseMakefiles(bool enable)
+ {this->ForceVerboseMakefiles=enable;}
+
protected:
void WriteMainMakefile2();
void WriteMainCMakefile();
@@ -185,6 +196,7 @@
MultipleOutputPairsType MultipleOutputPairs;
std::map<cmStdString, int > TargetSourceFileCount;
+ bool ForceVerboseMakefiles;
};
#endif
Index: cmLocalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.cxx,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -d -r1.211 -r1.212
--- cmLocalUnixMakefileGenerator3.cxx 23 May 2007 16:05:05 -0000 1.211
+++ cmLocalUnixMakefileGenerator3.cxx 5 Jun 2007 20:35:24 -0000 1.212
@@ -47,7 +47,6 @@
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 @@
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 @@
// 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 @@
// 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())
{
Index: cmGlobalKdevelopGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalKdevelopGenerator.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- cmGlobalKdevelopGenerator.cxx 17 May 2007 20:50:53 -0000 1.21
+++ cmGlobalKdevelopGenerator.cxx 5 Jun 2007 20:35:24 -0000 1.22
@@ -31,15 +31,7 @@
this->ForceUnixPaths = true;
this->FindMakeProgramFile = "CMakeUnixFindMake.cmake";
this->ToolSupportsColor = false;
-}
-
-///! Create a local generator appropriate to this Global Generator
-cmLocalGenerator *cmGlobalKdevelopGenerator::CreateLocalGenerator()
-{
- cmLocalUnixMakefileGenerator3 *lg = new cmLocalUnixMakefileGenerator3;
- lg->SetForceVerboseMakefiles(true);
- lg->SetGlobalGenerator(this);
- return lg;
+ this->SetForceVerboseMakefiles(true);
}
//----------------------------------------------------------------------------
More information about the Cmake-commits
mailing list