[Cmake-commits] [cmake-commits] king committed cmComputeLinkInformation.cxx 1.54 1.55

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Jul 28 08:36:22 EDT 2009


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

Modified Files:
	cmComputeLinkInformation.cxx 
Log Message:
BUG: Do not filter non-library implicit link items

We list implicit link items of languages linked into a target but filter
them by the implicit libraries known to be passed by the main linker
language.  Implicit link flags like "-z..." should not be filtered out
because they are not libraries.


Index: cmComputeLinkInformation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmComputeLinkInformation.cxx,v
retrieving revision 1.54
retrieving revision 1.55
diff -C 2 -d -r1.54 -r1.55
*** cmComputeLinkInformation.cxx	28 Jul 2009 12:08:00 -0000	1.54
--- cmComputeLinkInformation.cxx	28 Jul 2009 12:36:17 -0000	1.55
***************
*** 1627,1631 ****
        i != implicitLibVec.end(); ++i)
      {
!     this->ImplicitLinkLibs.insert(*i);
      }
  }
--- 1627,1637 ----
        i != implicitLibVec.end(); ++i)
      {
!     // Items starting in '-' but not '-l' are flags, not libraries,
!     // and should not be filtered by this implicit list.
!     std::string const& item = *i;
!     if(item[0] != '-' || item[1] == 'l')
!       {
!       this->ImplicitLinkLibs.insert(item);
!       }
      }
  }



More information about the Cmake-commits mailing list