diff options
author | KWSys Robot <kwrobot@kitware.com> | 2015-02-25 14:31:23 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2015-02-26 13:54:37 (GMT) |
commit | 5e2b418f7b0083b01004910848eb4823ea014ec1 (patch) | |
tree | 9a31e1aac5bf508d6de35c32b0bc0e019e756356 /SystemTools.hxx.in | |
parent | 0b9aad7568bc5f1cf56e01fe2b3dc57f5dff5133 (diff) | |
download | CMake-5e2b418f7b0083b01004910848eb4823ea014ec1.zip CMake-5e2b418f7b0083b01004910848eb4823ea014ec1.tar.gz CMake-5e2b418f7b0083b01004910848eb4823ea014ec1.tar.bz2 |
KWSys 2015-02-25 (1b75ad3d)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ 1b75ad3d | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' d4e7f08e..1b75ad3d
Domen Vrankar (3):
2b042ff6 SystemTools: Optionally report error from GetRealPath
7c9a970a Glob: Remove dead code
1b75ad3d Glob: Remove addition of extra '/'
Change-Id: I04ac5aa4748925bc953db0abff2d4418080882b5
Diffstat (limited to 'SystemTools.hxx.in')
-rw-r--r-- | SystemTools.hxx.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/SystemTools.hxx.in b/SystemTools.hxx.in index beb2a7e..93cde02 100644 --- a/SystemTools.hxx.in +++ b/SystemTools.hxx.in @@ -385,9 +385,12 @@ public: /** * Get the real path for a given path, removing all symlinks. In * the event of an error (non-existent path, permissions issue, - * etc.) the original path is returned. + * etc.) the original path is returned if errorMessage pointer is + * NULL. Otherwise empty string is returned and errorMessage + * contains error description. */ - static kwsys_stl::string GetRealPath(const kwsys_stl::string& path); + static kwsys_stl::string GetRealPath(const kwsys_stl::string& path, + kwsys_stl::string* errorMessage = 0); /** * Split a path name into its root component and the rest of the |