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

BUG: fix for 4009 lib64 should work with path suffix

This commit is contained in:
Bill Hoffman 2006-11-11 14:06:38 -05:00
parent 5ac4801a04
commit 93002a4400
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmFindBase.cxx
View File

@ -621,20 +621,18 @@ void cmFindBase::ExpandRegistryAndCleanPath()
j != this->SearchPathSuffixes.end(); ++j) j != this->SearchPathSuffixes.end(); ++j)
{ {
std::string p = *i + std::string("/") + *j; std::string p = *i + std::string("/") + *j;
if(cmSystemTools::FileIsDirectory(p.c_str())) // add to all paths because the search path may be modified
{ // later with lib being replaced for lib64 which may exist
this->SearchPaths.push_back(p); this->SearchPaths.push_back(p);
}
} }
} }
// now put the path without the path suffixes in the SearchPaths // now put the path without the path suffixes in the SearchPaths
for(i = finalPath.begin(); for(i = finalPath.begin();
i != finalPath.end(); ++i) i != finalPath.end(); ++i)
{ {
if(cmSystemTools::FileIsDirectory(i->c_str())) // put all search paths in because it may later be replaced
{ // by lib64 stuff fixes bug 4009
this->SearchPaths.push_back(*i); this->SearchPaths.push_back(*i);
}
} }
} }