Merge topic 'windows-resources-through-link'

c3b80e86 Windows: Add support for running CMake tools through a symlink

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1680
This commit is contained in:
Brad King 2018-01-25 13:30:16 +00:00 committed by Kitware Robot
commit 312512e2ba

View File

@ -2107,8 +2107,12 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
(void)argv0; // ignore this on windows
wchar_t modulepath[_MAX_PATH];
::GetModuleFileNameW(NULL, modulepath, sizeof(modulepath));
exe_dir =
cmSystemTools::GetFilenamePath(cmsys::Encoding::ToNarrow(modulepath));
std::string path = cmsys::Encoding::ToNarrow(modulepath);
std::string realPath = cmSystemTools::GetRealPath(path, NULL);
if (realPath.empty()) {
realPath = path;
}
exe_dir = cmSystemTools::GetFilenamePath(realPath);
#elif defined(__APPLE__)
(void)argv0; // ignore this on OS X
#define CM_EXE_PATH_LOCAL_SIZE 16384