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

ENH: clean up comment and avoid some vector access calles

This commit is contained in:
Bill Hoffman 2006-11-30 17:50:40 -05:00
parent 5ff037e894
commit 639d2572be
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmOrderLinkDirectories.cxx
View File

@ -463,18 +463,16 @@ bool cmOrderLinkDirectories::DetermineLibraryPathOrder()
#ifdef CM_ORDER_LINK_DIRECTORIES_DEBUG #ifdef CM_ORDER_LINK_DIRECTORIES_DEBUG
fprintf(stderr, "Raw link item [%s]\n", this->RawLinkItems[i].c_str()); fprintf(stderr, "Raw link item [%s]\n", this->RawLinkItems[i].c_str());
#endif #endif
// check to see if the file is a full path or just contains
// a / in it and is a path to something
cmStdString& item = this->RawLinkItems[i];
// if it is a full path to an item then separate it from the path // if it is a full path to an item then separate it from the path
// this only works with files and paths // this only works with files and paths
cmStdString& item = this->RawLinkItems[i];
if(cmSystemTools::FileIsFullPath(item.c_str())) if(cmSystemTools::FileIsFullPath(item.c_str()))
{ {
if(cmSystemTools::FileIsDirectory(this->RawLinkItems[i].c_str())) if(cmSystemTools::FileIsDirectory(item.c_str()))
{ {
if(cmSystemTools::IsPathToFramework(this->RawLinkItems[i].c_str())) if(cmSystemTools::IsPathToFramework(item.c_str()))
{ {
this->SplitFramework.find(this->RawLinkItems[i]); this->SplitFramework.find(item.c_str());
cmStdString path = this->SplitFramework.match(1); cmStdString path = this->SplitFramework.match(1);
// Add the -F path if we have not yet done so // Add the -F path if we have not yet done so
if(this->EmittedFrameworkPaths.insert(path).second) if(this->EmittedFrameworkPaths.insert(path).second)