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
This commit is contained in:
Brad King
2018-06-13 14:44:22 +00:00
committed by Kitware Robot

View File

@@ -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;
}