diff options
| author | Brad King <brad.king@kitware.com> | 2018-06-13 14:44:22 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-06-13 14:44:45 (GMT) |
| commit | 38e4246f37b832b88437e83710348c174be02508 (patch) | |
| tree | 1a6aef091ccb9b812bd344e209508f1b00ef6057 | |
| parent | cfac183295d9ce18403b0aa22c038a814f06832f (diff) | |
| parent | 4e6ff0ae247847ae5a2996d59106d8dc4aacced4 (diff) | |
| download | CMake-38e4246f37b832b88437e83710348c174be02508.zip CMake-38e4246f37b832b88437e83710348c174be02508.tar.gz CMake-38e4246f37b832b88437e83710348c174be02508.tar.bz2 | |
Merge topic 'restore-windows-resources-through-link'
4e6ff0ae24 Windows: Restore support for running CMake through a symlink
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2147
| -rw-r--r-- | Source/cmSystemTools.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 14f0580..72fd2bb 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -2131,7 +2131,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; } |