[cmake-commits] king committed cmComputeLinkInformation.cxx 1.21 1.22

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Feb 29 09:15:34 EST 2008


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

Modified Files:
	cmComputeLinkInformation.cxx 
Log Message:
BUG: cmComputeLinkInformation::CheckImplicitDirItem needs to extract the filename portion of the link item to test against the library regex.


Index: cmComputeLinkInformation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmComputeLinkInformation.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- cmComputeLinkInformation.cxx	21 Feb 2008 18:58:40 -0000	1.21
+++ cmComputeLinkInformation.cxx	29 Feb 2008 14:15:32 -0000	1.22
@@ -1074,7 +1074,8 @@
 
   // Only apply the policy below if the library file is one that can
   // be found by the linker.
-  if(!this->ExtractAnyLibraryName.find(item))
+  std::string file = cmSystemTools::GetFilenameName(item);
+  if(!this->ExtractAnyLibraryName.find(file))
     {
     return false;
     }
@@ -1085,7 +1086,6 @@
   // directory then just report the file name without the directory
   // portion.  This will allow the system linker to locate the proper
   // library for the architecture at link time.
-  std::string file = cmSystemTools::GetFilenameName(item);
   this->AddUserItem(file);
   return true;
 }



More information about the Cmake-commits mailing list