summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-06-10 13:17:41 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-06-10 13:17:41 (GMT)
commite0471ae2f93ef46461ff462bbc9e3be9b64c55ed (patch)
treecc7f41c249e862f3f6966b9a280ad964cc3a8068 /Source
parent2944bf164edf0e7a896bd47f5b8659c6469f6693 (diff)
parentb1c113d9a79c8ed78bffa63645a146593d19dadc (diff)
downloadCMake-e0471ae2f93ef46461ff462bbc9e3be9b64c55ed.zip
CMake-e0471ae2f93ef46461ff462bbc9e3be9b64c55ed.tar.gz
CMake-e0471ae2f93ef46461ff462bbc9e3be9b64c55ed.tar.bz2
Merge topic 'no-parse-directory'
b1c113d9 cmake: Do not open directories as scripts (#14966)
Diffstat (limited to 'Source')
-rw-r--r--Source/cmListFileCache.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx
index 705666d..3fc5b69 100644
--- a/Source/cmListFileCache.cxx
+++ b/Source/cmListFileCache.cxx
@@ -142,7 +142,8 @@ bool cmListFile::ParseFile(const char* filename,
bool topLevel,
cmMakefile *mf)
{
- if(!cmSystemTools::FileExists(filename))
+ if(!cmSystemTools::FileExists(filename) ||
+ cmSystemTools::FileIsDirectory(filename))
{
return false;
}