瀏覽代碼

cmGeneratorTarget: factor out common part of AddSources commands

Daniel Pfeifer 9 年之前
父節點
當前提交
cc6b948e5e
共有 2 個文件被更改,包括 10 次插入11 次删除
  1. 8 11
      Source/cmGeneratorTarget.cxx
  2. 2 0
      Source/cmGeneratorTarget.h

+ 8 - 11
Source/cmGeneratorTarget.cxx

@@ -468,9 +468,8 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
   return i->second;
 }
 
-void cmGeneratorTarget::AddSource(const std::string& src)
+void cmGeneratorTarget::AddSourceCommon(const std::string& src)
 {
-  this->Target->AddSource(src);
   cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
   cmGeneratorExpression ge(lfbt);
   CM_AUTO_PTR<cmCompiledGeneratorExpression> cge = ge.Parse(src);
@@ -480,19 +479,17 @@ void cmGeneratorTarget::AddSource(const std::string& src)
   this->LinkImplementationLanguageIsContextDependent = true;
 }
 
+void cmGeneratorTarget::AddSource(const std::string& src)
+{
+  this->Target->AddSource(src);
+  this->AddSourceCommon(src);
+}
+
 void cmGeneratorTarget::AddTracedSources(std::vector<std::string> const& srcs)
 {
   this->Target->AddTracedSources(srcs);
   if (!srcs.empty()) {
-    std::string srcFiles = cmJoin(srcs, ";");
-    this->SourceFilesMap.clear();
-    this->LinkImplementationLanguageIsContextDependent = true;
-    cmListFileBacktrace lfbt = this->Makefile->GetBacktrace();
-    cmGeneratorExpression ge(lfbt);
-    CM_AUTO_PTR<cmCompiledGeneratorExpression> cge = ge.Parse(srcFiles);
-    cge->SetEvaluateForBuildsystem(true);
-    this->SourceEntries.push_back(
-      new cmGeneratorTarget::TargetPropertyEntry(cge));
+    this->AddSourceCommon(cmJoin(srcs, ";"));
   }
 }
 

+ 2 - 0
Source/cmGeneratorTarget.h

@@ -540,6 +540,8 @@ public:
   std::string GetFortranModuleDirectory() const;
 
 private:
+  void AddSourceCommon(const std::string& src);
+
   std::string CreateFortranModuleDirectory() const;
   mutable bool FortranModuleDirectoryCreated;
   mutable std::string FortranModuleDirectory;