kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: 7011 findqt hangs because of glob with find_path and framework header serach

Browse Source
This commit is contained in:
Bill Hoffman 2008-05-23 15:25:04 -04:00
parent 6e0500878e
commit 2218d1527f
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmFindBase.cxx
View File

@ -378,12 +378,19 @@ void cmFindBase::AddFindPrefix(std::vector<std::string>& dest,
{ {
dir += "/"; dir += "/";
} }
dest.push_back(dir + subdir); if(subdir != "/")
{
std::string add = dir + subdir;
if(add != "/")
{
dest.push_back(add);
}
}
if (subdir == "bin") if (subdir == "bin")
{ {
dest.push_back(dir + "sbin"); dest.push_back(dir + "sbin");
} }
if(!subdir.empty()) if(!subdir.empty() && *it != "/")
{ {
dest.push_back(*it); dest.push_back(*it);
} }