[cmake-commits] hoffman committed cmDependsC.cxx 1.32 1.33 cmDependsFortran.cxx 1.27 1.28 cmMakeDepend.cxx 1.45 1.46

[cmake-commits at cmake.org]

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

Modified Files:
	cmDependsC.cxx cmDependsFortran.cxx cmMakeDepend.cxx 
Log Message:
BUG: fix for bug 6136 make sure includes are not directories


Index: cmDependsFortran.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmDependsFortran.cxx,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- cmDependsFortran.cxx	5 Dec 2007 14:17:07 -0000	1.27
+++ cmDependsFortran.cxx	15 Dec 2007 01:31:27 -0000	1.28
@@ -174,7 +174,7 @@
       fullPath += "/";
       fullPath += m;
       fullPath += ".mod.stamp";
-      if(!cmSystemTools::FileExists(fullPath.c_str()))
+      if(!cmSystemTools::FileExists(fullPath.c_str(), true))
         {
         std::ofstream dummy(fullPath.c_str());
         dummy
@@ -303,7 +303,7 @@
   mod_upper += ".mod";
   mod_lower += ".mod";
 
-  if(cmSystemTools::FileExists(mod_upper.c_str()))
+  if(cmSystemTools::FileExists(mod_upper.c_str(), true))
     {
     if(!cmSystemTools::CopyFileIfDifferent(mod_upper.c_str(), stamp.c_str()))
       {
@@ -314,7 +314,7 @@
       }
     return true;
     }
-  else if(cmSystemTools::FileExists(mod_lower.c_str()))
+  else if(cmSystemTools::FileExists(mod_lower.c_str(), true))
     {
     if(!cmSystemTools::CopyFileIfDifferent(mod_lower.c_str(), stamp.c_str()))
       {
@@ -341,7 +341,7 @@
   if(cmSystemTools::FileIsFullPath(includeName))
     {
     fileName = includeName;
-    return cmSystemTools::FileExists(fileName.c_str());
+    return cmSystemTools::FileExists(fileName.c_str(), true);
     }
   else
     {
@@ -350,7 +350,7 @@
     std::string fullName = dir;
     fullName += "/";
     fullName += includeName;
-    if(cmSystemTools::FileExists(fullName.c_str()))
+    if(cmSystemTools::FileExists(fullName.c_str(), true))
       {
       fileName = fullName;
       return true;
@@ -363,7 +363,7 @@
       fullName = *i;
       fullName += "/";
       fullName += includeName;
-      if(cmSystemTools::FileExists(fullName.c_str()))
+      if(cmSystemTools::FileExists(fullName.c_str(), true))
         {
         fileName = fullName;
         return true;

Index: cmMakeDepend.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakeDepend.cxx,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- cmMakeDepend.cxx	18 Jun 2007 15:59:23 -0000	1.45
+++ cmMakeDepend.cxx	15 Dec 2007 01:31:27 -0000	1.46
@@ -103,7 +103,7 @@
   bool found = false;
 
   // If the file exists, use it to find dependency information.
-  if(cmSystemTools::FileExists(path))
+  if(cmSystemTools::FileExists(path, true))
     {
     // Use the real file to find its dependencies.
     this->DependWalk(info);
@@ -311,7 +311,7 @@
       }
     }
 
-  if(cmSystemTools::FileExists(fname))
+  if(cmSystemTools::FileExists(fname, true))
     {
     std::string fp = cmSystemTools::CollapseFullPath(fname);
     this->DirectoryToFileToPathMap[extraPath? extraPath: ""][fname] = fp;
@@ -327,7 +327,7 @@
       path = path + "/";
       }
     path = path + fname;
-    if(cmSystemTools::FileExists(path.c_str())
+    if(cmSystemTools::FileExists(path.c_str(), true)
        && !cmSystemTools::FileIsDirectory(path.c_str()))
       {
       std::string fp = cmSystemTools::CollapseFullPath(path.c_str());
@@ -344,7 +344,7 @@
       path = path + "/";
       }
     path = path + fname;
-    if(cmSystemTools::FileExists(path.c_str())
+    if(cmSystemTools::FileExists(path.c_str(), true)
        && !cmSystemTools::FileIsDirectory(path.c_str()))
       {
       std::string fp = cmSystemTools::CollapseFullPath(path.c_str());

Index: cmDependsC.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmDependsC.cxx,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- cmDependsC.cxx	7 Feb 2007 14:23:41 -0000	1.32
+++ cmDependsC.cxx	15 Dec 2007 01:31:27 -0000	1.33
@@ -113,13 +113,13 @@
     std::string fullName;
     if(first || cmSystemTools::FileIsFullPath(current.FileName.c_str()))
       {
-      if(cmSystemTools::FileExists(current.FileName.c_str()))
+      if(cmSystemTools::FileExists(current.FileName.c_str(), true))
         {
         fullName = current.FileName;
         }
       }
     else if(!current.QuotedLocation.empty() &&
-            cmSystemTools::FileExists(current.QuotedLocation.c_str()))
+            cmSystemTools::FileExists(current.QuotedLocation.c_str(), true))
       {
       // The include statement producing this entry was a double-quote
       // include and the included file is present in the directory of
@@ -167,7 +167,7 @@
           }
 
         // Look for the file in this location.
-        if(cmSystemTools::FileExists(tempPathStr.c_str()))
+        if(cmSystemTools::FileExists(tempPathStr.c_str(), true))
           {
             fullName = tempPathStr;
             HeaderLocationCache[cacheKey]=fullName;