Explorar el Código

BUG: fix for bug 373 make depend problem

Bill Hoffman hace 22 años
padre
commit
9d4aefc088
Se han modificado 1 ficheros con 4 adiciones y 2 borrados
  1. 4 2
      Source/cmMakeDepend.cxx

+ 4 - 2
Source/cmMakeDepend.cxx

@@ -324,7 +324,8 @@ std::string cmMakeDepend::FullPath(const char* fname, const char *extraPath)
       path = path + "/";
       path = path + "/";
       }
       }
     path = path + fname;
     path = path + fname;
-    if(cmSystemTools::FileExists(path.c_str()))
+    if(cmSystemTools::FileExists(path.c_str())
+       && !cmSystemTools::FileIsDirectory(path.c_str()))
       {
       {
       std::string fp = cmSystemTools::CollapseFullPath(path.c_str());
       std::string fp = cmSystemTools::CollapseFullPath(path.c_str());
       m_DirectoryToFileToPathMap[extraPath? extraPath: ""][fname] = fp;
       m_DirectoryToFileToPathMap[extraPath? extraPath: ""][fname] = fp;
@@ -340,7 +341,8 @@ std::string cmMakeDepend::FullPath(const char* fname, const char *extraPath)
       path = path + "/";
       path = path + "/";
       }
       }
     path = path + fname;
     path = path + fname;
-    if(cmSystemTools::FileExists(path.c_str()))
+    if(cmSystemTools::FileExists(path.c_str())
+       && !cmSystemTools::FileIsDirectory(path.c_str()))
       {
       {
       std::string fp = cmSystemTools::CollapseFullPath(path.c_str());
       std::string fp = cmSystemTools::CollapseFullPath(path.c_str());
       m_DirectoryToFileToPathMap[extraPath][fname] = fp;
       m_DirectoryToFileToPathMap[extraPath][fname] = fp;