mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 15:18:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'windows-symlink-errors'

Browse Source 
d7522b8f86 cmSystemTools: Improve CreateLink and CreateSymlink error codes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6096
This commit is contained in:
Brad King
2021-05-10 14:09:53 +00:00
committed by Kitware Robot
parent 6f9a513181 d7522b8f86
commit 74d35f5693
7 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmSystemTools.cxx
+15 -3
View File
@@ -3173,9 +3173,15 @@ cmsys::Status cmSystemTools::CreateSymlink(std::string const& origName,
flags, nullptr);
cmsys::Status status;
if (err) {
#if defined(_WIN32)
status = cmsys::Status::Windows(uv_fs_get_system_error(&req));
#elif UV_VERSION_MAJOR > 1 || (UV_VERSION_MAJOR == 1 && UV_VERSION_MINOR >= 38)
status = cmsys::Status::POSIX(uv_fs_get_system_error(&req));
#else
status = cmsys::Status::POSIX(-err);
std::string e =
"failed to create symbolic link '" + newName + "': " + uv_strerror(err);
#endif
std::string e = cmStrCat("failed to create symbolic link '", newName,
"': ", status.GetString());
if (errorMessage) {
*errorMessage = std::move(e);
} else {
@@ -3194,9 +3200,15 @@ cmsys::Status cmSystemTools::CreateLink(std::string const& origName,
uv_fs_link(nullptr, &req, origName.c_str(), newName.c_str(), nullptr);
cmsys::Status status;
if (err) {
#if defined(_WIN32)
status = cmsys::Status::Windows(uv_fs_get_system_error(&req));
#elif UV_VERSION_MAJOR > 1 || (UV_VERSION_MAJOR == 1 && UV_VERSION_MINOR >= 38)
status = cmsys::Status::POSIX(uv_fs_get_system_error(&req));
#else
status = cmsys::Status::POSIX(-err);
#endif
std::string e =
"failed to create link '" + newName + "': " + uv_strerror(err);
cmStrCat("failed to create link '", newName, "': ", status.GetString());
if (errorMessage) {
*errorMessage = std::move(e);
} else {