浏览代码

BUG: fix some bad changes in progress calc

Ken Martin 17 年之前
父节点
当前提交
2ad4f4bb9d
共有 1 个文件被更改,包括 2 次插入6 次删除
  1. 2 6
      Source/cmGlobalUnixMakefileGenerator3.cxx

+ 2 - 6
Source/cmGlobalUnixMakefileGenerator3.cxx

@@ -877,16 +877,12 @@ unsigned long cmGlobalUnixMakefileGenerator3
 ::GetNumberOfProgressActionsInAll(cmLocalUnixMakefileGenerator3 *lg)
 ::GetNumberOfProgressActionsInAll(cmLocalUnixMakefileGenerator3 *lg)
 {
 {
   unsigned long result = 0;
   unsigned long result = 0;
+  std::set<cmStdString> emitted;
   std::set<cmTarget *>& targets = this->LocalGeneratorToTargetMap[lg];
   std::set<cmTarget *>& targets = this->LocalGeneratorToTargetMap[lg];
   for(std::set<cmTarget *>::iterator t = targets.begin();
   for(std::set<cmTarget *>::iterator t = targets.begin();
       t != targets.end(); ++t)
       t != targets.end(); ++t)
     {
     {
-    cmTarget * target = *t;
-    cmLocalUnixMakefileGenerator3 *lg3 =
-      static_cast<cmLocalUnixMakefileGenerator3 *>
-      (target->GetMakefile()->GetLocalGenerator());
-    std::vector<int> &progFiles = lg3->ProgressFiles[target->GetName()];
-    result += static_cast<unsigned long>(progFiles.size());
+    result += this->GetTargetTotalNumberOfActions(**t,emitted);
     }
     }
   return result;
   return result;
 }
 }