[cmake-commits] hoffman committed cmFindBase.cxx 1.14.2.3 1.14.2.4

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-4
	cmFindBase.cxx 
Log Message:
ENH: merge changes in from main tree


Index: cmFindBase.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFindBase.cxx,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -u -d -r1.14.2.3 -r1.14.2.4
--- cmFindBase.cxx	27 Oct 2006 20:01:47 -0000	1.14.2.3
+++ cmFindBase.cxx	13 Nov 2006 17:59:55 -0000	1.14.2.4
@@ -621,21 +621,19 @@
         j != this->SearchPathSuffixes.end(); ++j)
       {
       std::string p = *i + std::string("/") + *j;
-      if(cmSystemTools::FileIsDirectory(p.c_str()))
-        {
+      // 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()))
-      {
+    // put all search paths in because it may later be replaced
+    // by lib64 stuff fixes bug 4009
       this->SearchPaths.push_back(*i);
       }
-    }
 }
 
 void cmFindBase::PrintFindStuff()