limit library search to appropriate extensions
This commit is contained in:
parent
6c757d2715
commit
212dfb1b8e
|
@ -942,6 +942,7 @@ std::string cmSystemTools::FindLibrary(const char* name,
|
||||||
for(std::vector<std::string>::const_iterator p = path.begin();
|
for(std::vector<std::string>::const_iterator p = path.begin();
|
||||||
p != path.end(); ++p)
|
p != path.end(); ++p)
|
||||||
{
|
{
|
||||||
|
#if defined(_WIN32) && !defined(__CYGWIN__)
|
||||||
tryPath = *p;
|
tryPath = *p;
|
||||||
tryPath += "/";
|
tryPath += "/";
|
||||||
tryPath += name;
|
tryPath += name;
|
||||||
|
@ -950,6 +951,7 @@ std::string cmSystemTools::FindLibrary(const char* name,
|
||||||
{
|
{
|
||||||
return cmSystemTools::CollapseFullPath(tryPath.c_str());
|
return cmSystemTools::CollapseFullPath(tryPath.c_str());
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
tryPath = *p;
|
tryPath = *p;
|
||||||
tryPath += "/lib";
|
tryPath += "/lib";
|
||||||
tryPath += name;
|
tryPath += name;
|
||||||
|
@ -974,6 +976,7 @@ std::string cmSystemTools::FindLibrary(const char* name,
|
||||||
{
|
{
|
||||||
return cmSystemTools::CollapseFullPath(tryPath.c_str());
|
return cmSystemTools::CollapseFullPath(tryPath.c_str());
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
// Couldn't find the library.
|
// Couldn't find the library.
|
||||||
|
|
Loading…
Reference in New Issue