ENH: make sure find library does not find directories
This commit is contained in:
parent
8d1a5c48e7
commit
2936c54cdd
|
@ -1219,7 +1219,8 @@ kwsys_stl::string SystemTools::FindLibrary(const char* name,
|
||||||
tryPath += "/";
|
tryPath += "/";
|
||||||
tryPath += name;
|
tryPath += name;
|
||||||
tryPath += ".lib";
|
tryPath += ".lib";
|
||||||
if(SystemTools::FileExists(tryPath.c_str()))
|
if(SystemTools::FileExists(tryPath.c_str())
|
||||||
|
&& !SystemTools::FileIsDirectory(tryPath.c_str()))
|
||||||
{
|
{
|
||||||
return SystemTools::CollapseFullPath(tryPath.c_str());
|
return SystemTools::CollapseFullPath(tryPath.c_str());
|
||||||
}
|
}
|
||||||
|
@ -1228,7 +1229,8 @@ kwsys_stl::string SystemTools::FindLibrary(const char* name,
|
||||||
tryPath += "/lib";
|
tryPath += "/lib";
|
||||||
tryPath += name;
|
tryPath += name;
|
||||||
tryPath += ".so";
|
tryPath += ".so";
|
||||||
if(SystemTools::FileExists(tryPath.c_str()))
|
if(SystemTools::FileExists(tryPath.c_str())
|
||||||
|
&& !SystemTools::FileIsDirectory(tryPath.c_str()))
|
||||||
{
|
{
|
||||||
return SystemTools::CollapseFullPath(tryPath.c_str());
|
return SystemTools::CollapseFullPath(tryPath.c_str());
|
||||||
}
|
}
|
||||||
|
@ -1236,7 +1238,8 @@ kwsys_stl::string SystemTools::FindLibrary(const char* name,
|
||||||
tryPath += "/lib";
|
tryPath += "/lib";
|
||||||
tryPath += name;
|
tryPath += name;
|
||||||
tryPath += ".a";
|
tryPath += ".a";
|
||||||
if(SystemTools::FileExists(tryPath.c_str()))
|
if(SystemTools::FileExists(tryPath.c_str())
|
||||||
|
&& !SystemTools::FileIsDirectory(tryPath.c_str()))
|
||||||
{
|
{
|
||||||
return SystemTools::CollapseFullPath(tryPath.c_str());
|
return SystemTools::CollapseFullPath(tryPath.c_str());
|
||||||
}
|
}
|
||||||
|
@ -1244,7 +1247,8 @@ kwsys_stl::string SystemTools::FindLibrary(const char* name,
|
||||||
tryPath += "/lib";
|
tryPath += "/lib";
|
||||||
tryPath += name;
|
tryPath += name;
|
||||||
tryPath += ".sl";
|
tryPath += ".sl";
|
||||||
if(SystemTools::FileExists(tryPath.c_str()))
|
if(SystemTools::FileExists(tryPath.c_str())
|
||||||
|
&& !SystemTools::FileIsDirectory(tryPath.c_str()))
|
||||||
{
|
{
|
||||||
return SystemTools::CollapseFullPath(tryPath.c_str());
|
return SystemTools::CollapseFullPath(tryPath.c_str());
|
||||||
}
|
}
|
||||||
|
@ -1252,7 +1256,8 @@ kwsys_stl::string SystemTools::FindLibrary(const char* name,
|
||||||
tryPath += "/lib";
|
tryPath += "/lib";
|
||||||
tryPath += name;
|
tryPath += name;
|
||||||
tryPath += ".dylib";
|
tryPath += ".dylib";
|
||||||
if(SystemTools::FileExists(tryPath.c_str()))
|
if(SystemTools::FileExists(tryPath.c_str())
|
||||||
|
&& !SystemTools::FileIsDirectory(tryPath.c_str()))
|
||||||
{
|
{
|
||||||
return SystemTools::CollapseFullPath(tryPath.c_str());
|
return SystemTools::CollapseFullPath(tryPath.c_str());
|
||||||
}
|
}
|
||||||
|
@ -1260,7 +1265,8 @@ kwsys_stl::string SystemTools::FindLibrary(const char* name,
|
||||||
tryPath += "/lib";
|
tryPath += "/lib";
|
||||||
tryPath += name;
|
tryPath += name;
|
||||||
tryPath += ".dll";
|
tryPath += ".dll";
|
||||||
if(SystemTools::FileExists(tryPath.c_str()))
|
if(SystemTools::FileExists(tryPath.c_str())
|
||||||
|
&& !SystemTools::FileIsDirectory(tryPath.c_str()))
|
||||||
{
|
{
|
||||||
return SystemTools::CollapseFullPath(tryPath.c_str());
|
return SystemTools::CollapseFullPath(tryPath.c_str());
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue