diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2007-12-15 01:31:27 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2007-12-15 01:31:27 (GMT) |
| commit | a5e76555bf9ac5fac6876ba73f8c3a7cdcabc351 (patch) | |
| tree | 57b6daf9dd561b16c7d63345993b3370808ef7d5 /Source/cmMakeDepend.cxx | |
| parent | 0304073ea6cafadd612fe9bbcc06dcaa6131f1e4 (diff) | |
| download | CMake-a5e76555bf9ac5fac6876ba73f8c3a7cdcabc351.zip CMake-a5e76555bf9ac5fac6876ba73f8c3a7cdcabc351.tar.gz CMake-a5e76555bf9ac5fac6876ba73f8c3a7cdcabc351.tar.bz2 | |
BUG: fix for bug 6136 make sure includes are not directories
Diffstat (limited to 'Source/cmMakeDepend.cxx')
| -rw-r--r-- | Source/cmMakeDepend.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmMakeDepend.cxx b/Source/cmMakeDepend.cxx index d0e0827..61cb443 100644 --- a/Source/cmMakeDepend.cxx +++ b/Source/cmMakeDepend.cxx @@ -103,7 +103,7 @@ void cmMakeDepend::GenerateDependInformation(cmDependInformation* info) 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 @@ std::string cmMakeDepend::FullPath(const char* fname, const char *extraPath) } } - 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 @@ std::string cmMakeDepend::FullPath(const char* fname, const char *extraPath) 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 @@ std::string cmMakeDepend::FullPath(const char* fname, const char *extraPath) 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()); |