[Cmake-commits] [cmake-commits] martink committed cmGlobalUnixMakefileGenerator3.cxx 1.125 1.126

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv7224/Source

Modified Files:
	cmGlobalUnixMakefileGenerator3.cxx 
Log Message:
BUG: fix some bad changes in progress calc


Index: cmGlobalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalUnixMakefileGenerator3.cxx,v
retrieving revision 1.125
retrieving revision 1.126
diff -C 2 -d -r1.125 -r1.126
*** cmGlobalUnixMakefileGenerator3.cxx	31 Jan 2008 03:56:34 -0000	1.125
--- cmGlobalUnixMakefileGenerator3.cxx	12 Mar 2008 18:37:46 -0000	1.126
***************
*** 878,891 ****
  {
    unsigned long result = 0;
    std::set<cmTarget *>& targets = this->LocalGeneratorToTargetMap[lg];
    for(std::set<cmTarget *>::iterator t = targets.begin();
        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());
      }
    return result;
--- 878,887 ----
  {
    unsigned long result = 0;
+   std::set<cmStdString> emitted;
    std::set<cmTarget *>& targets = this->LocalGeneratorToTargetMap[lg];
    for(std::set<cmTarget *>::iterator t = targets.begin();
        t != targets.end(); ++t)
      {
!     result += this->GetTargetTotalNumberOfActions(**t,emitted);
      }
    return result;