[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1575-gf9183eb

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  f9183eb38efda48630a47e624096fe1a88bc778b (commit)
       via  e51088a3687c41b23bc7678c4cccc17ce04511ce (commit)
      from  55dcddb639933cb3790d17462ddd3823637c5d62 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9183eb38efda48630a47e624096fe1a88bc778b
commit f9183eb38efda48630a47e624096fe1a88bc778b
Merge: 55dcddb e51088a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 20 16:28:35 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 20 16:28:35 2014 -0500

    Merge topic 'target-SOURCES-refactor' into next
    
    e51088a3 Drop caching of source file genex evaluation results.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e51088a3687c41b23bc7678c4cccc17ce04511ce
commit e51088a3687c41b23bc7678c4cccc17ce04511ce
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Feb 20 22:25:29 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Feb 20 22:25:29 2014 +0100

    Drop caching of source file genex evaluation results.
    
    Continue to cache the ObjectSources for OBJECT_LIBRARY targets, as
    that is used in UseObjectLibraries.  However, that won't survive
    the follow-up topic anyway.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index f7f11ac..004c610 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -236,15 +236,7 @@ struct TagVisitor
 
 //----------------------------------------------------------------------------
 cmGeneratorTarget::cmGeneratorTarget(cmTarget* t): Target(t),
-  SourceFileFlagsConstructed(false),
-  ObjectSourcesDone(false),
-  IDLSourcesDone(false),
-  ExtraSourcesDone(false),
-  HeaderSourcesDone(false),
-  CustomCommandsDone(false),
-  ExternalObjectsDone(false),
-  ResxDone(false),
-  ModuleDefinitionFileDone(false)
+  SourceFileFlagsConstructed(false)
 {
   this->Makefile = this->Target->GetMakefile();
   this->LocalGenerator = this->Makefile->GetLocalGenerator();
@@ -315,11 +307,10 @@ static void handleSystemIncludesDep(cmMakefile *mf, cmTarget* depTgt,
 }
 
 #define IMPLEMENT_VISIT_IMPL(DATA, DATATYPE) \
-if (!this->DATA ## Done) \
   { \
   std::vector<cmSourceFile*> sourceFiles; \
   this->Target->GetSourceFiles(sourceFiles); \
-  TagVisitor<DATA ## Tag DATATYPE> visitor(this->Target, this->DATA); \
+  TagVisitor<DATA ## Tag DATATYPE> visitor(this->Target, data); \
   for(std::vector<cmSourceFile*>::const_iterator si = sourceFiles.begin(); \
       si != sourceFiles.end(); ++si) \
     { \
@@ -329,9 +320,8 @@ if (!this->DATA ## Done) \
       } \
     visitor.Accept(*si); \
     } \
-  this->DATA ## Done = true; \
   } \
-data = this->DATA;
+
 
 #define IMPLEMENT_VISIT(DATA) \
   IMPLEMENT_VISIT_IMPL(DATA, EMPTY) \
@@ -344,6 +334,10 @@ void
 cmGeneratorTarget::GetObjectSources(std::vector<cmSourceFile*> &data) const
 {
   IMPLEMENT_VISIT(ObjectSources);
+  if (this->Target->GetType() == cmTarget::OBJECT_LIBRARY)
+    {
+    this->ObjectSources = data;
+    }
 }
 
 //----------------------------------------------------------------------------
@@ -408,7 +402,7 @@ cmGeneratorTarget::GetExternalObjects(std::vector<cmSourceFile*>& data) const
 void
 cmGeneratorTarget::GetExpectedResxHeaders(std::set<std::string>& srcs) const
 {
-  ResxData data = this->Resx;
+  ResxData data;
   IMPLEMENT_VISIT_IMPL(Resx, COMMA cmGeneratorTarget::ResxData)
   srcs = data.ExpectedResxHeaders;
 }
@@ -416,7 +410,7 @@ cmGeneratorTarget::GetExpectedResxHeaders(std::set<std::string>& srcs) const
 //----------------------------------------------------------------------------
 void cmGeneratorTarget::GetResxSources(std::vector<cmSourceFile*>& srcs) const
 {
-  ResxData data = this->Resx;
+  ResxData data;
   IMPLEMENT_VISIT_IMPL(Resx, COMMA cmGeneratorTarget::ResxData)
   srcs = data.ResxSources;
 }
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 381adc7..1e6ce64 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -121,24 +121,7 @@ private:
   struct SourceEntry { std::vector<cmSourceFile*> Depends; };
   typedef std::map<cmSourceFile*, SourceEntry> SourceEntriesType;
   SourceEntriesType SourceEntries;
-  mutable std::string ModuleDefinitionFile;
 
-  mutable ResxData Resx;
-
-  mutable bool SourceFileFlagsConstructed;
-  mutable bool ObjectSourcesDone;
-  mutable bool IDLSourcesDone;
-  mutable bool ExtraSourcesDone;
-  mutable bool HeaderSourcesDone;
-  mutable bool CustomCommandsDone;
-  mutable bool ExternalObjectsDone;
-  mutable bool ResxDone;
-  mutable bool ModuleDefinitionFileDone;
-  mutable std::vector<cmSourceFile*> CustomCommands;
-  mutable std::vector<cmSourceFile*> ExtraSources;
-  mutable std::vector<cmSourceFile*> HeaderSources;
-  mutable std::vector<cmSourceFile*> ExternalObjects;
-  mutable std::vector<cmSourceFile*> IDLSources;
   std::map<cmSourceFile const*, std::string> Objects;
   std::set<cmSourceFile const*> ExplicitObjectName;
   mutable std::vector<cmSourceFile*> ObjectSources;
@@ -146,6 +129,7 @@ private:
   mutable std::map<std::string, std::vector<std::string> > SystemIncludesCache;
 
   void ConstructSourceFileFlags() const;
+  mutable bool SourceFileFlagsConstructed;
   mutable std::map<cmSourceFile const*, SourceFileFlags> SourceFlagsMap;
 
   cmGeneratorTarget(cmGeneratorTarget const&);

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGeneratorTarget.cxx |   24 +++++++++---------------
 Source/cmGeneratorTarget.h   |   18 +-----------------
 2 files changed, 10 insertions(+), 32 deletions(-)


hooks/post-receive
-- 
CMake