[cmake-commits] hoffman committed cmOrderLinkDirectories.cxx 1.36 1.37
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Nov 30 17:50:42 EST 2006
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv31797/Source
Modified Files:
cmOrderLinkDirectories.cxx
Log Message:
ENH: clean up comment and avoid some vector access calles
Index: cmOrderLinkDirectories.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmOrderLinkDirectories.cxx,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- cmOrderLinkDirectories.cxx 30 Nov 2006 22:32:45 -0000 1.36
+++ cmOrderLinkDirectories.cxx 30 Nov 2006 22:50:40 -0000 1.37
@@ -463,18 +463,16 @@
#ifdef CM_ORDER_LINK_DIRECTORIES_DEBUG
fprintf(stderr, "Raw link item [%s]\n", this->RawLinkItems[i].c_str());
#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
// this only works with files and paths
+ cmStdString& item = this->RawLinkItems[i];
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);
// Add the -F path if we have not yet done so
if(this->EmittedFrameworkPaths.insert(path).second)
More information about the Cmake-commits
mailing list