Cleanup cmTarget source file list representation

This teaches cmTarget to use a set of cmSourceFile pointers to guarantee
unique insertion of source files in a target.  The order of insertion is
still preserved in the SourceFiles vector.

2 files changed, 19 insertions, 11 deletions

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 8b4ac6f..26c0e39 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1089,7 +1089,6 @@ private:
   cmGlobalGenerator* GlobalGenerator;
   std::queue<cmStdString> DependencyQueue;
   std::set<cmStdString> DependenciesQueued;
-  std::set<cmSourceFile*> TargetSources;
 
   void QueueOnce(std::string const& name);
   void QueueOnce(std::vector<std::string> const& names);
@@ -1120,9 +1119,6 @@ cmTargetTraceDependencies
     // Queue the dependencies of the source file in case they are
     // generated.
     this->QueueDependencies(*si);
-
-    // Track the sources already known to the target.
-    this->TargetSources.insert(*si);
     }
 
   // Queue the VS project file to check dependencies on the rule to
@@ -1156,10 +1152,7 @@ void cmTargetTraceDependencies::Trace()
       this->QueueDependencies(sf);
 
       // Make sure this file is in the target.
-      if(this->TargetSources.insert(sf).second)
-        {
-        this->Target->AddSourceFile(sf);
-        }
+      this->Target->AddSourceFile(sf);
       }
     }
 }
@@ -1331,6 +1324,21 @@ bool cmTarget::FindSourceFiles()
 }
 
 //----------------------------------------------------------------------------
+std::vector<cmSourceFile*> const& cmTarget::GetSourceFiles()
+{
+  return this->SourceFiles;
+}
+
+//----------------------------------------------------------------------------
+void cmTarget::AddSourceFile(cmSourceFile* sf)
+{
+  if(this->SourceFileSet.insert(sf).second)
+    {
+    this->SourceFiles.push_back(sf);
+    }
+}
+
+//----------------------------------------------------------------------------
 void cmTarget::AddSources(std::vector<std::string> const& srcs)
 {
   for(std::vector<std::string>::const_iterator i = srcs.begin();
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 7b8c2ba..5054f2d 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -119,9 +119,8 @@ public:
   /**
    * Get the list of the source files used by this target
    */
-  std::vector<cmSourceFile*> const &GetSourceFiles()
-    {return this->SourceFiles;}
-  void AddSourceFile(cmSourceFile* sf) { this->SourceFiles.push_back(sf); }
+  std::vector<cmSourceFile*> const& GetSourceFiles();
+  void AddSourceFile(cmSourceFile* sf);
 
   /**
    * Flags for a given source file as used in this target. Typically assigned
@@ -531,6 +530,7 @@ private:
   std::vector<cmCustomCommand> PostBuildCommands;
   TargetType TargetTypeValue;
   std::vector<cmSourceFile*> SourceFiles;
+  std::set<cmSourceFile*> SourceFileSet;
   LinkLibraryVectorType LinkLibraries;
   LinkLibraryVectorType PrevLinkedLibraries;
   bool LinkLibrariesAnalyzed;