[Cmake-commits] [cmake-commits] martink committed cmGlobalUnixMakefileGenerator3.cxx 1.128 1.129 cmGlobalUnixMakefileGenerator3.h 1.55 1.56

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalUnixMakefileGenerator3.cxx 
	cmGlobalUnixMakefileGenerator3.h 
Log Message:
BUG: improve progress reporting when there are multiple targets with the same name, bug# 7042


Index: cmGlobalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalUnixMakefileGenerator3.cxx,v
retrieving revision 1.128
retrieving revision 1.129
diff -C 2 -d -r1.128 -r1.129
*** cmGlobalUnixMakefileGenerator3.cxx	12 May 2008 22:33:08 -0000	1.128
--- cmGlobalUnixMakefileGenerator3.cxx	29 May 2008 15:50:33 -0000	1.129
***************
*** 772,776 ****
                                cmLocalGenerator::SHELL);
        //
!       std::set<cmStdString> emitted;
        progCmd << " " 
                << this->GetTargetTotalNumberOfActions(t->second,
--- 772,776 ----
                                cmLocalGenerator::SHELL);
        //
!       std::set<cmTarget *> emitted;
        progCmd << " " 
                << this->GetTargetTotalNumberOfActions(t->second,
***************
*** 849,859 ****
  //----------------------------------------------------------------------------
  int cmGlobalUnixMakefileGenerator3
! ::GetTargetTotalNumberOfActions(cmTarget & target,
!                                 std::set<cmStdString> &emitted)
  {
    // do not double count
    int result = 0;
  
!   if(emitted.insert(target.GetName()).second)
      {
      cmLocalUnixMakefileGenerator3 *lg = 
--- 849,859 ----
  //----------------------------------------------------------------------------
  int cmGlobalUnixMakefileGenerator3
! ::GetTargetTotalNumberOfActions(cmTarget &target,
!                                 std::set<cmTarget *> &emitted)
  {
    // do not double count
    int result = 0;
  
!   if(emitted.insert(&target).second)
      {
      cmLocalUnixMakefileGenerator3 *lg = 
***************
*** 878,882 ****
  {
    unsigned long result = 0;
!   std::set<cmStdString> emitted;
    std::set<cmTarget *>& targets = this->LocalGeneratorToTargetMap[lg];
    for(std::set<cmTarget *>::iterator t = targets.begin();
--- 878,882 ----
  {
    unsigned long result = 0;
!   std::set<cmTarget *> emitted;
    std::set<cmTarget *>& targets = this->LocalGeneratorToTargetMap[lg];
    for(std::set<cmTarget *>::iterator t = targets.begin();

Index: cmGlobalUnixMakefileGenerator3.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalUnixMakefileGenerator3.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -C 2 -d -r1.55 -r1.56
*** cmGlobalUnixMakefileGenerator3.h	14 Feb 2008 21:42:29 -0000	1.55
--- cmGlobalUnixMakefileGenerator3.h	29 May 2008 15:50:33 -0000	1.56
***************
*** 116,120 ****
    // returns some progress informaiton
    int GetTargetTotalNumberOfActions(cmTarget & target,
!                                     std::set<cmStdString> &emitted);
    unsigned long GetNumberOfProgressActionsInAll
    (cmLocalUnixMakefileGenerator3 *lg);
--- 116,120 ----
    // returns some progress informaiton
    int GetTargetTotalNumberOfActions(cmTarget & target,
!                                     std::set<cmTarget *> &emitted);
    unsigned long GetNumberOfProgressActionsInAll
    (cmLocalUnixMakefileGenerator3 *lg);