BUG: Removed output of dual rules for source files that are processed by both the compiler and by a custom command. Also removed generation of duplicate CMakeLists.txt in the project files.

1 files changed, 8 insertions, 14 deletions

diff --git a/Source/cmSourceGroup.h b/Source/cmSourceGroup.h
index db79ecc..9162f2b 100644
--- a/Source/cmSourceGroup.h
+++ b/Source/cmSourceGroup.h
@@ -77,20 +77,17 @@ public:
   /**
    * Map from source to command map.
    */
-  typedef std::map<std::string, Commands>  CustomCommands;
+  typedef std::map<std::string, Commands>  BuildRules;
 
   bool Matches(const char* name);
   void SetGroupRegex(const char* regex)
     { m_GroupRegex.compile(regex); }
-  void AddSource(const char* name)
-    { m_Sources.push_back(name); }
+  void AddSource(const char* name);
   void AddCustomCommand(const cmCustomCommand &cmd);
   const char* GetName() const
     { return m_Name.c_str(); }
-  const std::vector<std::string>& GetSources() const
-    { return m_Sources; }
-  const CustomCommands& GetCustomCommands() const
-    { return m_CustomCommands; }
+  const BuildRules& GetBuildRules() const
+    { return m_BuildRules; }
   
 private:
   /**
@@ -104,14 +101,11 @@ private:
   cmRegularExpression m_GroupRegex;
   
   /**
-   * The sources in this group that the compiler will know how to build.
+   * Map from source name to the commands to build from the source.
+   * Some commands may build from files that the compiler also knows how to
+   * build.
    */
-  std::vector<std::string> m_Sources;
-  
-  /**
-   * The custom commands in this group and their corresponding sources.
-   */
-  CustomCommands m_CustomCommands;  
+  BuildRules m_BuildRules;  
 };
 
 #endif