[Cmake-commits] [cmake-commits] hoffman committed cmFindBase.cxx 1.35 1.36

[cmake-commits at cmake.org]

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

Modified Files:
	cmFindBase.cxx 
Log Message:
BUG: fix network path by mistake in search 


Index: cmFindBase.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFindBase.cxx,v
retrieving revision 1.35
retrieving revision 1.36
diff -C 2 -d -r1.35 -r1.36
*** cmFindBase.cxx	7 Mar 2008 20:30:33 -0000	1.35
--- cmFindBase.cxx	7 Apr 2008 02:19:06 -0000	1.36
***************
*** 496,500 ****
          j != this->SearchPathSuffixes.end(); ++j)
        {
!       std::string p = *i + std::string("/") + *j;
        // add to all paths because the search path may be modified 
        // later with lib being replaced for lib64 which may exist
--- 496,508 ----
          j != this->SearchPathSuffixes.end(); ++j)
        {
!       // if *i is only / then do not add a //
!       // this will get incorrectly considered a network
!       // path on windows and cause huge delays.
!       std::string p = *i;
!       if(p.size() && p[p.size()-1] != '/')
!         {
!         p += std::string("/");
!         }
!       p +=  *j;
        // add to all paths because the search path may be modified 
        // later with lib being replaced for lib64 which may exist