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

BUG: fix unix path search

This commit is contained in:
Bill Hoffman 2001-05-10 15:50:03 -04:00
parent a15ae83e95
commit d04756d8f7
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmSystemTools.cxx
View File

@ -686,22 +686,25 @@ std::string cmSystemTools::FindLibrary(const char* name,
{ {
return cmSystemTools::CollapseFullPath(tryPath.c_str()); return cmSystemTools::CollapseFullPath(tryPath.c_str());
} }
tryPath = "lib"; tryPath = *p;
tryPath += *p; tryPath += "/lib";
tryPath += name;
tryPath + ".so"; tryPath + ".so";
if(cmSystemTools::FileExists(tryPath.c_str())) if(cmSystemTools::FileExists(tryPath.c_str()))
{ {
return cmSystemTools::CollapseFullPath(tryPath.c_str()); return cmSystemTools::CollapseFullPath(tryPath.c_str());
} }
tryPath = "lib"; tryPath = *p;
tryPath += *p; tryPath = "/lib";
tryPath += name;
tryPath + ".a"; tryPath + ".a";
if(cmSystemTools::FileExists(tryPath.c_str())) if(cmSystemTools::FileExists(tryPath.c_str()))
{ {
return cmSystemTools::CollapseFullPath(tryPath.c_str()); return cmSystemTools::CollapseFullPath(tryPath.c_str());
} }
tryPath = "lib"; tryPath = *p;
tryPath += *p; tryPath = "/lib";
tryPath += name;
tryPath + ".sl"; tryPath + ".sl";
if(cmSystemTools::FileExists(tryPath.c_str())) if(cmSystemTools::FileExists(tryPath.c_str()))
{ {