diff options
| author | Brad King <brad.king@kitware.com> | 2018-05-31 12:47:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-05-31 12:48:36 (GMT) |
| commit | 61c4858c3741da533d100eb0cbbebfd9fc720d20 (patch) | |
| tree | 80e826eebc7a83d439aeb5ce4c0227db061d825c /Source/cmSystemTools.cxx | |
| parent | 0b32ae944fe058883c65532b353a709980eabe6d (diff) | |
| parent | 83630d491888705dc650f2ae62de9943181b50df (diff) | |
| download | CMake-61c4858c3741da533d100eb0cbbebfd9fc720d20.zip CMake-61c4858c3741da533d100eb0cbbebfd9fc720d20.tar.gz CMake-61c4858c3741da533d100eb0cbbebfd9fc720d20.tar.bz2 | |
Merge topic 'revert-windows_symlinks'
83630d4918 cmSystemTools: Revert GetRealPath implementation on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2114
Diffstat (limited to 'Source/cmSystemTools.cxx')
| -rw-r--r-- | Source/cmSystemTools.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 169b525..cf1068f 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -949,10 +949,12 @@ cmSystemTools::WindowsFileRetry cmSystemTools::GetWindowsFileRetry() } return retry; } +#endif -std::string cmSystemTools::GetRealPath(const std::string& path, - std::string* errorMessage) +std::string cmSystemTools::GetRealPathResolvingWindowsSubst( + const std::string& path, std::string* errorMessage) { +#ifdef _WIN32 // uv_fs_realpath uses Windows Vista API so fallback to kwsys if not found std::string resolved_path; uv_fs_t req; @@ -981,8 +983,10 @@ std::string cmSystemTools::GetRealPath(const std::string& path, resolved_path = path; } return resolved_path; -} +#else + return cmsys::SystemTools::GetRealPath(path, errorMessage); #endif +} void cmSystemTools::InitializeLibUV() { |