[Cmake-commits] [cmake-commits] king committed cmComputeLinkInformation.cxx 1.43 1.44 cmComputeLinkInformation.h 1.21 1.22

[cmake-commits at cmake.org]

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

Modified Files:
	cmComputeLinkInformation.cxx cmComputeLinkInformation.h 
Log Message:
ENH: Keep target information in final link line

In cmComputeLinkInformation items in the final link line returned by
GetItems now contain a pointer to their corresponding cmTarget if they
were produced by a target.  This makes available the set of all targets
linked.


Index: cmComputeLinkInformation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmComputeLinkInformation.cxx,v
retrieving revision 1.43
retrieving revision 1.44
diff -C 2 -d -r1.43 -r1.44
*** cmComputeLinkInformation.cxx	18 Aug 2008 15:39:22 -0000	1.43
--- cmComputeLinkInformation.cxx	15 Sep 2008 17:30:07 -0000	1.44
***************
*** 595,599 ****
                                           true);
        linkItem += exe;
!       this->Items.push_back(Item(linkItem, true));
        this->Depends.push_back(exe);
        }
--- 595,599 ----
                                           true);
        linkItem += exe;
!       this->Items.push_back(Item(linkItem, true, tgt));
        this->Depends.push_back(exe);
        }
***************
*** 1021,1025 ****
  
    // Now add the full path to the library.
!   this->Items.push_back(Item(item, true));
  }
  
--- 1021,1025 ----
  
    // Now add the full path to the library.
!   this->Items.push_back(Item(item, true, target));
  }
  

Index: cmComputeLinkInformation.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmComputeLinkInformation.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C 2 -d -r1.21 -r1.22
*** cmComputeLinkInformation.h	23 Jul 2008 16:59:14 -0000	1.21
--- cmComputeLinkInformation.h	15 Sep 2008 17:30:07 -0000	1.22
***************
*** 41,49 ****
    struct Item
    {
!     Item(): Value(), IsPath(true) {}
!     Item(Item const& item): Value(item.Value), IsPath(item.IsPath) {}
!     Item(std::string const& v, bool p): Value(v), IsPath(p) {}
      std::string Value;
      bool IsPath;
    };
    typedef std::vector<Item> ItemVector;
--- 41,52 ----
    struct Item
    {
!     Item(): Value(), IsPath(true), Target(0) {}
!     Item(Item const& item):
!       Value(item.Value), IsPath(item.IsPath), Target(item.Target) {}
!     Item(std::string const& v, bool p, cmTarget* target = 0):
!       Value(v), IsPath(p), Target(target) {}
      std::string Value;
      bool IsPath;
+     cmTarget* Target;
    };
    typedef std::vector<Item> ItemVector;