[cmake-commits] hoffman committed cmFindBase.cxx 1.17 1.18

[cmake-commits at cmake.org]

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

Modified Files:
	cmFindBase.cxx 
Log Message:
BUG: fix for 4009 lib64 should work with path suffix


Index: cmFindBase.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFindBase.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- cmFindBase.cxx	19 Oct 2006 13:18:59 -0000	1.17
+++ cmFindBase.cxx	11 Nov 2006 19:06:38 -0000	1.18
@@ -621,20 +621,18 @@
         j != this->SearchPathSuffixes.end(); ++j)
       {
       std::string p = *i + std::string("/") + *j;
-      if(cmSystemTools::FileIsDirectory(p.c_str()))
-        {
-        this->SearchPaths.push_back(p);
-        }
+      // add to all paths because the search path may be modified 
+      // later with lib being replaced for lib64 which may exist
+      this->SearchPaths.push_back(p);
       }
     }
   // now put the path without the path suffixes in the SearchPaths
   for(i = finalPath.begin();
       i != finalPath.end(); ++i)
     {
-    if(cmSystemTools::FileIsDirectory(i->c_str()))
-      {
-      this->SearchPaths.push_back(*i);
-      }
+    // put all search paths in because it may later be replaced
+    // by lib64 stuff fixes bug 4009
+    this->SearchPaths.push_back(*i);
     }
 }