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

Merge topic 'file-REMOVE_RECURSE-symlink' 

f123367 file: Do not remove symlinked directories recursively (#10538)
This commit is contained in:
Brad King 2013-02-15 13:11:27 -05:00 committed by CMake Topic Stage
parent 0e2ed9b097 f123367254
commit c1dc807494
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmFileCommand.cxx
View File

@ -2409,7 +2409,8 @@ bool cmFileCommand::HandleRemove(std::vector<std::string> const& args,
fileName += "/" + *i; fileName += "/" + *i;
} }
if(cmSystemTools::FileIsDirectory(fileName.c_str()) && recurse) if(cmSystemTools::FileIsDirectory(fileName.c_str()) &&
!cmSystemTools::FileIsSymlink(fileName.c_str()) && recurse)
{ {
cmSystemTools::RemoveADirectory(fileName.c_str()); cmSystemTools::RemoveADirectory(fileName.c_str());
} }