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

[cmake-commits at cmake.org]

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

Modified Files:
	cmFindBase.cxx 
Log Message:
BUG: 7011 findqt hangs because of glob with find_path and framework header serach


Index: cmFindBase.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFindBase.cxx,v
retrieving revision 1.36
retrieving revision 1.37
diff -C 2 -d -r1.36 -r1.37
*** cmFindBase.cxx	7 Apr 2008 02:19:06 -0000	1.36
--- cmFindBase.cxx	23 May 2008 19:25:04 -0000	1.37
***************
*** 379,388 ****
        dir += "/";
        }
!     dest.push_back(dir + subdir);
      if (subdir == "bin")
        {
        dest.push_back(dir + "sbin");
        }
!     if(!subdir.empty())
        {
        dest.push_back(*it);
--- 379,395 ----
        dir += "/";
        }
!     if(subdir != "/")
!       {
!       std::string add = dir + subdir;
!       if(add != "/")
!         {
!         dest.push_back(add);
!         }
!       }
      if (subdir == "bin")
        {
        dest.push_back(dir + "sbin");
        }
!     if(!subdir.empty() && *it != "/")
        {
        dest.push_back(*it);