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

BUG: Fix recent find_library change to look for user-specified name first to do so only if the name matches a valid library extension.

Browse Source
This commit is contained in:
Brad King 2008-02-10 11:37:06 -05:00
parent 138d479c67
commit fd2a6a8693
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Source/cmFindLibraryCommand.cxx
View File

@ -234,6 +234,24 @@ std::string cmFindLibraryCommand::FindLibrary(const char* name)
std::vector<std::string> suffixes; std::vector<std::string> suffixes;
cmSystemTools::ExpandListArgument(prefixes_list, prefixes, true); cmSystemTools::ExpandListArgument(prefixes_list, prefixes, true);
cmSystemTools::ExpandListArgument(suffixes_list, suffixes, true); cmSystemTools::ExpandListArgument(suffixes_list, suffixes, true);
// If the original library name provided by the user matches one of
// the suffixes, try it first.
bool tryOrig = false;
{
std::string nm = name;
for(std::vector<std::string>::const_iterator si = suffixes.begin();
!tryOrig && si != suffixes.end(); ++si)
{
std::string const& suffix = *si;
if(nm.length() > suffix.length() &&
nm.substr(nm.size()-suffix.length()) == suffix)
{
tryOrig = true;
}
}
}
// Add a trailing slash to all paths to aid the search process. // Add a trailing slash to all paths to aid the search process.
for(std::vector<std::string>::iterator i = this->SearchPaths.begin(); for(std::vector<std::string>::iterator i = this->SearchPaths.begin();
i != this->SearchPaths.end(); ++i) i != this->SearchPaths.end(); ++i)
@ -264,13 +282,16 @@ std::string cmFindLibraryCommand::FindLibrary(const char* name)
if(!onlyFrameworks) if(!onlyFrameworks)
{ {
// Try the original library name as specified by the user. // Try the original library name as specified by the user.
tryPath = *p; if(tryOrig)
tryPath += name;
if(cmSystemTools::FileExists(tryPath.c_str(), true))
{ {
tryPath = cmSystemTools::CollapseFullPath(tryPath.c_str()); tryPath = *p;
cmSystemTools::ConvertToUnixSlashes(tryPath); tryPath += name;
return tryPath; if(cmSystemTools::FileExists(tryPath.c_str(), true))
{
tryPath = cmSystemTools::CollapseFullPath(tryPath.c_str());
cmSystemTools::ConvertToUnixSlashes(tryPath);
return tryPath;
}
} }
// Try various library naming conventions. // Try various library naming conventions.