diff options
| author | Brad King <brad.king@kitware.com> | 2022-08-02 13:28:42 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-08-02 13:28:48 (GMT) |
| commit | 40b45f55f43715874ded8a2f021c65e168762be4 (patch) | |
| tree | c976df251a7e8151a946b9237ab42dad36c23268 | |
| parent | a2daa18237f2c3c58c37ab9d1c202c63e0f150a7 (diff) | |
| parent | a4f1c0fac84aab713d89d842be244c7427e014bd (diff) | |
| download | CMake-40b45f55f43715874ded8a2f021c65e168762be4.zip CMake-40b45f55f43715874ded8a2f021c65e168762be4.tar.gz CMake-40b45f55f43715874ded8a2f021c65e168762be4.tar.bz2 | |
Merge topic 'windows-symlink-dir' into release-3.24
a4f1c0fac8 Windows: Revert "Prefer junctions for directory symlinks"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7530
| -rw-r--r-- | Source/cmSystemTools.cxx | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 78d3ad9..f077801 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -3358,22 +3358,12 @@ cmsys::Status cmSystemTools::CreateSymlink(std::string const& origName, uv_fs_t req; int flags = 0; #if defined(_WIN32) - bool const isDir = cmsys::SystemTools::FileIsDirectory(origName); - if (isDir) { - flags |= UV_FS_SYMLINK_JUNCTION; + if (cmsys::SystemTools::FileIsDirectory(origName)) { + flags |= UV_FS_SYMLINK_DIR; } #endif int err = uv_fs_symlink(nullptr, &req, origName.c_str(), newName.c_str(), flags, nullptr); -#if defined(_WIN32) - if (err && uv_fs_get_system_error(&req) == ERROR_NOT_SUPPORTED && isDir) { - // Try fallback to symlink for network (requires additional permissions). - flags ^= UV_FS_SYMLINK_JUNCTION | UV_FS_SYMLINK_DIR; - err = uv_fs_symlink(nullptr, &req, origName.c_str(), newName.c_str(), - flags, nullptr); - } -#endif - cmsys::Status status; if (err) { #if defined(_WIN32) |