diff options
| author | Brad King <brad.king@kitware.com> | 2016-04-01 14:01:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-04-01 14:01:52 (GMT) |
| commit | e8c1363ee8f08cf0b36e17f85ddb461abd06e0b6 (patch) | |
| tree | 327146431cb62c74dbe1deeecf5faf2776a5fbc1 | |
| parent | 9e33f02bd9ac9e35256b371df936ab67e615601a (diff) | |
| parent | 168e44e2028d905272323e0a66e3735c30460f5a (diff) | |
| download | CMake-e8c1363ee8f08cf0b36e17f85ddb461abd06e0b6.zip CMake-e8c1363ee8f08cf0b36e17f85ddb461abd06e0b6.tar.gz CMake-e8c1363ee8f08cf0b36e17f85ddb461abd06e0b6.tar.bz2 | |
Merge topic 'update-kwsys'
168e44e2 Merge branch 'upstream-KWSys' into update-kwsys
731ad172 KWSys 2016-03-31 (3392da1d)
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 0c7f419..c6e668d 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -2855,6 +2855,7 @@ static bool DeleteJunction(const std::wstring& source) return false; #endif } + #endif bool SystemTools::RemoveFile(const std::string& source) @@ -2884,9 +2885,9 @@ bool SystemTools::RemoveFile(const std::string& source) SetLastError(err); return false; } - if (IsJunction(ws) && !DeleteJunction(ws)) + if (IsJunction(ws) && DeleteJunction(ws)) { - return false; + return true; } if (DeleteFileW(ws.c_str()) || GetLastError() == ERROR_FILE_NOT_FOUND || |