[Cmake-commits] [cmake-commits] king committed cmMakefileTargetGenerator.cxx 1.103 1.104

[cmake-commits at cmake.org]

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

Modified Files:
	cmMakefileTargetGenerator.cxx 
Log Message:
ENH: Use new link info during dependency scanning

This removes another use of the old-style link line computation.


Index: cmMakefileTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileTargetGenerator.cxx,v
retrieving revision 1.103
retrieving revision 1.104
diff -C 2 -d -r1.103 -r1.104
*** cmMakefileTargetGenerator.cxx	3 Jun 2008 13:55:28 -0000	1.103
--- cmMakefileTargetGenerator.cxx	15 Sep 2008 17:30:17 -0000	1.104
***************
*** 949,962 ****
      << "# Targets to which this target links.\n"
      << "SET(CMAKE_TARGET_LINKED_INFO_FILES\n";
-   cmGlobalGenerator* gg = this->GlobalGenerator;
    std::set<cmTarget const*> emitted;
!   cmTarget::LinkLibraryVectorType const& libs =
!     this->Target->GetLinkLibraries();
!   for(cmTarget::LinkLibraryVectorType::const_iterator j = libs.begin();
!       j != libs.end(); ++j)
      {
!     if(cmTarget const* linkee = gg->FindTarget(0, j->first.c_str()))
        {
!       if(emitted.insert(linkee).second)
          {
          cmMakefile* mf = linkee->GetMakefile();
--- 949,962 ----
      << "# Targets to which this target links.\n"
      << "SET(CMAKE_TARGET_LINKED_INFO_FILES\n";
    std::set<cmTarget const*> emitted;
!   const char* cfg = this->LocalGenerator->ConfigurationName.c_str();
!   if(cmComputeLinkInformation* cli = this->Target->GetLinkInformation(cfg))
      {
!     cmComputeLinkInformation::ItemVector const& items = cli->GetItems();
!     for(cmComputeLinkInformation::ItemVector::const_iterator
!           i = items.begin(); i != items.end(); ++i)
        {
!       cmTarget const* linkee = i->Target;
!       if(linkee && !linkee->IsImported() && emitted.insert(linkee).second)
          {
          cmMakefile* mf = linkee->GetMakefile();