[Cmake-commits] [cmake-commits] king committed cmFindLibraryCommand.cxx 1.62 1.63

[cmake-commits at cmake.org]

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

Modified Files:
	cmFindLibraryCommand.cxx 
Log Message:
BUG: Fix lib/ to lib/64/ search path conversion

Automatic generation of 64-bit library search paths must preserve
trailing slashes.  This fixes a failure case exposed by the recent
rewrite of find_library, which assumes trailing slashes occur on all
search paths.


Index: cmFindLibraryCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFindLibraryCommand.cxx,v
retrieving revision 1.62
retrieving revision 1.63
diff -C 2 -d -r1.62 -r1.63
*** cmFindLibraryCommand.cxx	22 Sep 2008 15:08:16 -0000	1.62
--- cmFindLibraryCommand.cxx	23 Sep 2008 17:34:23 -0000	1.63
***************
*** 183,186 ****
--- 183,187 ----
      // try to replace lib with lib64 and see if it is there,
      // then prepend it to the path
+     // Note that all paths have trailing slashes.
      if((s != *i) && cmSystemTools::FileIsDirectory(s.c_str()))
        {
***************
*** 190,194 ****
      // now just add a 64 to the path name and if it is there,
      // add it to the path
!     s2 += "64";
      if(cmSystemTools::FileIsDirectory(s2.c_str()))
        {
--- 191,195 ----
      // now just add a 64 to the path name and if it is there,
      // add it to the path
!     s2 += "64/";
      if(cmSystemTools::FileIsDirectory(s2.c_str()))
        {