diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-26 13:54:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-02-26 13:54:42 (GMT) |
| commit | 266568654c23ee1b4dea487a684cdb6304eb33aa (patch) | |
| tree | 7b33270382a2f8f4957eed6075cb145580625be5 /Source/kwsys/SystemTools.hxx.in | |
| parent | 4817d2814a6d82e35590f9bfff2b088c95d45395 (diff) | |
| parent | 5e2b418f7b0083b01004910848eb4823ea014ec1 (diff) | |
| download | CMake-266568654c23ee1b4dea487a684cdb6304eb33aa.zip CMake-266568654c23ee1b4dea487a684cdb6304eb33aa.tar.gz CMake-266568654c23ee1b4dea487a684cdb6304eb33aa.tar.bz2 | |
Merge branch 'upstream-kwsys' into update-kwsys
Diffstat (limited to 'Source/kwsys/SystemTools.hxx.in')
| -rw-r--r-- | Source/kwsys/SystemTools.hxx.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/kwsys/SystemTools.hxx.in b/Source/kwsys/SystemTools.hxx.in index beb2a7e..93cde02 100644 --- a/Source/kwsys/SystemTools.hxx.in +++ b/Source/kwsys/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 |