This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 38e4246f37b832b88437e83710348c174be02508 (commit)
via 4e6ff0ae247847ae5a2996d59106d8dc4aacced4 (commit)
from cfac183295d9ce18403b0aa22c038a814f06832f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38e4246f37b832b88437e83710348c174be02508
commit 38e4246f37b832b88437e83710348c174be02508
Merge: cfac183 4e6ff0a
Author: Brad King <[email protected]>
AuthorDate: Wed Jun 13 14:44:22 2018 +0000
Commit: Kitware Robot <[email protected]>
CommitDate: Wed Jun 13 10:44:45 2018 -0400
Merge topic 'restore-windows-resources-through-link'
4e6ff0ae24 Windows: Restore support for running CMake through a symlink
Acked-by: Kitware Robot <[email protected]>
Merge-request: !2147
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e6ff0ae247847ae5a2996d59106d8dc4aacced4
commit 4e6ff0ae247847ae5a2996d59106d8dc4aacced4
Author: Brad King <[email protected]>
AuthorDate: Tue Jun 12 11:02:28 2018 -0400
Commit: Brad King <[email protected]>
CommitDate: Tue Jun 12 11:15:50 2018 -0400
Windows: Restore support for running CMake through a symlink
The change in commit v3.11.3~3^2 (cmSystemTools: Revert GetRealPath
implementation on Windows, 2018-05-29) broke the feature added by commit
v3.11.0-rc1~64^2 (Windows: Add support for running CMake tools through a
symlink, 2018-01-21). Use `GetRealPathResolvingWindowsSubst` in the
latter code path to restore it.
Fixes: #17882
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 6f326de..9575c05 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -2117,7 +2117,8 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
wchar_t modulepath[_MAX_PATH];
::GetModuleFileNameW(NULL, modulepath, sizeof(modulepath));
std::string path = cmsys::Encoding::ToNarrow(modulepath);
- std::string realPath = cmSystemTools::GetRealPath(path, NULL);
+ std::string realPath =
+ cmSystemTools::GetRealPathResolvingWindowsSubst(path, NULL);
if (realPath.empty()) {
realPath = path;
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmSystemTools.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
https://cmake.org/mailman/listinfo/cmake-commits
