BUG: 7011 findqt hangs because of glob with find_path and framework header serach
This commit is contained in:
parent
6e0500878e
commit
2218d1527f
|
@ -378,12 +378,19 @@ void cmFindBase::AddFindPrefix(std::vector<std::string>& dest,
|
|||
{
|
||||
dir += "/";
|
||||
}
|
||||
dest.push_back(dir + subdir);
|
||||
if(subdir != "/")
|
||||
{
|
||||
std::string add = dir + subdir;
|
||||
if(add != "/")
|
||||
{
|
||||
dest.push_back(add);
|
||||
}
|
||||
}
|
||||
if (subdir == "bin")
|
||||
{
|
||||
dest.push_back(dir + "sbin");
|
||||
}
|
||||
if(!subdir.empty())
|
||||
if(!subdir.empty() && *it != "/")
|
||||
{
|
||||
dest.push_back(*it);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue