[cmake-commits] hoffman committed cmOrderLinkDirectories.cxx 1.33 1.34

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv422/Source

Modified Files:
	cmOrderLinkDirectories.cxx 
Log Message:
BUG: fix a problem where it tried to link .dll.lib files


Index: cmOrderLinkDirectories.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmOrderLinkDirectories.cxx,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- cmOrderLinkDirectories.cxx	5 Oct 2006 20:59:46 -0000	1.33
+++ cmOrderLinkDirectories.cxx	29 Nov 2006 20:57:49 -0000	1.34
@@ -463,7 +463,10 @@
 #ifdef CM_ORDER_LINK_DIRECTORIES_DEBUG
     fprintf(stderr, "Raw link item [%s]\n", this->RawLinkItems[i].c_str());
 #endif
-    if(cmSystemTools::FileIsFullPath(this->RawLinkItems[i].c_str()))
+    // check to see if the file is a full path or just contains 
+    // a / in it and is a path to something
+    if(cmSystemTools::FileIsFullPath(this->RawLinkItems[i].c_str())
+      || this->RawLinkItems[i].find("/") != cmStdString.npos)
       {
       if(cmSystemTools::FileIsDirectory(this->RawLinkItems[i].c_str()))
         {
@@ -486,6 +489,8 @@
           }
         else
           {
+          // A full path to a directory was found as a link item
+          // warn user 
           std::string message = 
             "Warning: Ignoring path found in link libraries for target: ";
           message += this->TargetName;
@@ -496,7 +501,7 @@
           cmSystemTools::Message(message.c_str());
           continue;
           }
-        }
+        } // is it a directory
       if(!framework)
         {
         dir = cmSystemTools::GetFilenamePath(this->RawLinkItems[i]);