This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 588c2d55c679e75cd1250b21e6d3129e84e040b1 (commit)
via 168e44e2028d905272323e0a66e3735c30460f5a (commit)
via 731ad1724f08fb4255664fe8e09c581ad9c062fb (commit)
from dd1cf308e9cf28d494d65170048f1e8a112318c4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=588c2d55c679e75cd1250b21e6d3129e84e040b1
commit 588c2d55c679e75cd1250b21e6d3129e84e040b1
Merge: dd1cf30 168e44e
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Mar 31 08:47:08 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Mar 31 08:47:08 2016 -0400
Merge topic 'update-kwsys' into next
168e44e2 Merge branch 'upstream-KWSys' into update-kwsys
731ad172 KWSys 2016-03-31 (3392da1d)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=168e44e2028d905272323e0a66e3735c30460f5a
commit 168e44e2028d905272323e0a66e3735c30460f5a
Merge: 0aa736e 731ad17
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Mar 31 08:46:50 2016 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Mar 31 08:46:50 2016 -0400
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2016-03-31 (3392da1d)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=731ad1724f08fb4255664fe8e09c581ad9c062fb
commit 731ad1724f08fb4255664fe8e09c581ad9c062fb
Author: KWSys Upstream <kwro...@kitware.com>
AuthorDate: Thu Mar 31 08:29:28 2016 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Mar 31 08:46:49 2016 -0400
KWSys 2016-03-31 (3392da1d)
Code extracted from:
http://public.kitware.com/KWSys.git
at commit 3392da1df3c363d6d1a80fa3f0e49fbd45c9dcf7 (master).
Upstream Shortlog
-----------------
Ben Boeckel (2):
f6867bb7 SystemTools: flip junction deletion around
3392da1d SystemTools: add buffer around preproc conditions
diff --git a/SystemTools.cxx b/SystemTools.cxx
index 0c7f419..c6e668d 100644
--- a/SystemTools.cxx
+++ b/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 ||
-----------------------------------------------------------------------
Summary of changes:
Source/kwsys/SystemTools.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
