diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2008-05-23 19:25:04 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2008-05-23 19:25:04 (GMT) |
| commit | 2218d1527f2f5fc218fc055108dc3c2b7e3ceea0 (patch) | |
| tree | ecae8ab9204b90568b885e0f8cd2a822552c3d7d /Source/cmFindBase.cxx | |
| parent | 6e0500878e6c2cf252e30f40f5d348579bdac5ee (diff) | |
| download | CMake-2218d1527f2f5fc218fc055108dc3c2b7e3ceea0.zip CMake-2218d1527f2f5fc218fc055108dc3c2b7e3ceea0.tar.gz CMake-2218d1527f2f5fc218fc055108dc3c2b7e3ceea0.tar.bz2 | |
BUG: 7011 findqt hangs because of glob with find_path and framework header serach
Diffstat (limited to 'Source/cmFindBase.cxx')
| -rw-r--r-- | Source/cmFindBase.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx index 8b54a91..9321708 100644 --- a/Source/cmFindBase.cxx +++ b/Source/cmFindBase.cxx @@ -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); } |