diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-27 15:34:31 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-02-27 15:34:31 (GMT) |
| commit | ee81de5ec35d1219f89097938b7aa63b40ed4b7a (patch) | |
| tree | 17434248aaa868258d0e2e61c35642094f5c7920 /Source/kwsys/SystemTools.hxx.in | |
| parent | 4bef659da525441464ed110d362b46a6eac50a82 (diff) | |
| parent | 266568654c23ee1b4dea487a684cdb6304eb33aa (diff) | |
| download | CMake-ee81de5ec35d1219f89097938b7aa63b40ed4b7a.zip CMake-ee81de5ec35d1219f89097938b7aa63b40ed4b7a.tar.gz CMake-ee81de5ec35d1219f89097938b7aa63b40ed4b7a.tar.bz2 | |
Merge topic 'update-kwsys'
26656865 Merge branch 'upstream-kwsys' into update-kwsys
5e2b418f KWSys 2015-02-25 (1b75ad3d)
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 |