diff options
| author | Brad King <brad.king@kitware.com> | 2017-12-15 15:48:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-12-15 15:48:13 (GMT) |
| commit | 4966c8d8dabfb8e1077d69137f32031fa38a9ae5 (patch) | |
| tree | 31d9bd0c64759145efa4816e65fa6858ccc9c867 | |
| parent | f67f76c2b3a4c50d4116ce806df0c7f861e227dd (diff) | |
| parent | 86399e49398cc9e8028e280eee3e89992ab3fd11 (diff) | |
| download | CMake-4966c8d8dabfb8e1077d69137f32031fa38a9ae5.zip CMake-4966c8d8dabfb8e1077d69137f32031fa38a9ae5.tar.gz CMake-4966c8d8dabfb8e1077d69137f32031fa38a9ae5.tar.bz2 | |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2017-12-15 (8f755ee9)
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 649f30b..f547362 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -2509,6 +2509,14 @@ bool SystemTools::RemoveFile(const std::string& source) if (IsJunction(ws) && DeleteJunction(ws)) { return true; } + const DWORD DIRECTORY_SOFT_LINK_ATTRS = + FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_REPARSE_POINT; + DWORD attrs = GetFileAttributesW(ws.c_str()); + if (attrs != INVALID_FILE_ATTRIBUTES && + (attrs & DIRECTORY_SOFT_LINK_ATTRS) == DIRECTORY_SOFT_LINK_ATTRS && + RemoveDirectoryW(ws.c_str())) { + return true; + } if (DeleteFileW(ws.c_str()) || GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_PATH_NOT_FOUND) { return true; |