diff options
| author | Brad King <brad.king@kitware.com> | 2018-06-13 14:52:01 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-06-13 14:52:01 (GMT) |
| commit | 985c78c7e1ec93662691c4b078dad847b715a991 (patch) | |
| tree | 78e2b33f5c21bb609c5b907df58c3aaa845f4117 /Source/cmSystemTools.cxx | |
| parent | 93fe9fc1a218ac96756cf8181a2d3421ab090192 (diff) | |
| parent | 4e6ff0ae247847ae5a2996d59106d8dc4aacced4 (diff) | |
| download | CMake-985c78c7e1ec93662691c4b078dad847b715a991.zip CMake-985c78c7e1ec93662691c4b078dad847b715a991.tar.gz CMake-985c78c7e1ec93662691c4b078dad847b715a991.tar.bz2 | |
Merge branch 'restore-windows-resources-through-link' into release-3.12
Merge-request: !2147
Diffstat (limited to 'Source/cmSystemTools.cxx')
| -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; } |