[Cmake-commits] [cmake-commits] king committed cmComputeLinkInformation.cxx 1.36 1.37 cmComputeLinkInformation.h 1.19 1.20

[cmake-commits at cmake.org]

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

Modified Files:
	cmComputeLinkInformation.cxx cmComputeLinkInformation.h 
Log Message:
ENH: Skip libs in known dirs for CMP0003 warnings.

Sometimes we ask the linker to search for a library for which the path
is known but for some reason cannot be specified by full path.  In these
cases do not include the library in CMP0003 warnings because we know the
extra paths are not needed for it.


Index: cmComputeLinkInformation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmComputeLinkInformation.cxx,v
retrieving revision 1.36
retrieving revision 1.37
diff -C 2 -d -r1.36 -r1.37
*** cmComputeLinkInformation.cxx	21 Jul 2008 14:07:56 -0000	1.36
--- cmComputeLinkInformation.cxx	23 Jul 2008 16:19:54 -0000	1.37
***************
*** 638,642 ****
        {
        // This is a library or option specified by the user.
!       this->AddUserItem(item);
        }
      }
--- 638,642 ----
        {
        // This is a library or option specified by the user.
!       this->AddUserItem(item, true);
        }
      }
***************
*** 1156,1165 ****
    // portion.  This will allow the system linker to locate the proper
    // library for the architecture at link time.
!   this->AddUserItem(file);
    return true;
  }
  
  //----------------------------------------------------------------------------
! void cmComputeLinkInformation::AddUserItem(std::string const& item)
  {
    // This is called to handle a link item that does not match a CMake
--- 1156,1166 ----
    // portion.  This will allow the system linker to locate the proper
    // library for the architecture at link time.
!   this->AddUserItem(file, false);
    return true;
  }
  
  //----------------------------------------------------------------------------
! void cmComputeLinkInformation::AddUserItem(std::string const& item,
!                                            bool pathNotKnown)
  {
    // This is called to handle a link item that does not match a CMake
***************
*** 1251,1255 ****
      {
      // This is a name specified by the user.
!     this->OldUserFlagItems.push_back(item);
  
      // We must ask the linker to search for a library with this name.
--- 1252,1259 ----
      {
      // This is a name specified by the user.
!     if(pathNotKnown)
!       {
!       this->OldUserFlagItems.push_back(item);
!       }
  
      // We must ask the linker to search for a library with this name.
***************
*** 1374,1378 ****
    // path instead of just the name.
    std::string file = cmSystemTools::GetFilenameName(item);
!   this->AddUserItem(file);
  
    // Make sure the link directory ordering will find the library.
--- 1378,1382 ----
    // path instead of just the name.
    std::string file = cmSystemTools::GetFilenameName(item);
!   this->AddUserItem(file, false);
  
    // Make sure the link directory ordering will find the library.

Index: cmComputeLinkInformation.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmComputeLinkInformation.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C 2 -d -r1.19 -r1.20
*** cmComputeLinkInformation.h	30 Apr 2008 22:04:48 -0000	1.19
--- cmComputeLinkInformation.h	23 Jul 2008 16:19:54 -0000	1.20
***************
*** 140,144 ****
    void AddFullItem(std::string const& item);
    bool CheckImplicitDirItem(std::string const& item);
!   void AddUserItem(std::string const& item);
    void AddDirectoryItem(std::string const& item);
    void AddFrameworkItem(std::string const& item);
--- 140,144 ----
    void AddFullItem(std::string const& item);
    bool CheckImplicitDirItem(std::string const& item);
!   void AddUserItem(std::string const& item, bool pathNotKnown);
    void AddDirectoryItem(std::string const& item);
    void AddFrameworkItem(std::string const& item);