kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'no-parse-directory' 

b1c113d9 cmake: Do not open directories as scripts (#14966)
This commit is contained in:
Brad King 2014-06-10 09:17:41 -04:00 committed by CMake Topic Stage
parent 2944bf164e b1c113d9a7
commit e0471ae2f9
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmListFileCache.cxx
View File

@ -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;
}

1
Tests/RunCMake/CommandLine/P_directory-result.txt Normal file
View File

@ -0,0 +1 @@
1

1
Tests/RunCMake/CommandLine/P_directory-stderr.txt Normal file
View File

@ -0,0 +1 @@
^CMake Error: Error processing file: .*/Tests/RunCMake/CommandLine$

2
Tests/RunCMake/CommandLine/RunCMakeTest.cmake
View File

@ -35,3 +35,5 @@ run_cmake_command(E_sleep-no-args ${CMAKE_COMMAND} -E sleep)
run_cmake_command(E_sleep-bad-arg1 ${CMAKE_COMMAND} -E sleep x)
run_cmake_command(E_sleep-bad-arg2 ${CMAKE_COMMAND} -E sleep 1 -1)
run_cmake_command(E_sleep-one-tenth ${CMAKE_COMMAND} -E sleep 0.1)
run_cmake_command(P_directory ${CMAKE_COMMAND} -P ${RunCMake_SOURCE_DIR})