diff options
| author | Brad King <brad.king@kitware.com> | 2018-06-12 15:19:07 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-06-12 15:19:07 (GMT) |
| commit | 051e0be742071fdd5eca2bc90f372422f27fd1fa (patch) | |
| tree | aaf0a3b2b14cbbb0c556f26c7710d1bec00d4c51 | |
| parent | 2ccd426045cbd6357b349c50f97e86394742b9c3 (diff) | |
| parent | 4e6ff0ae247847ae5a2996d59106d8dc4aacced4 (diff) | |
| download | CMake-051e0be742071fdd5eca2bc90f372422f27fd1fa.zip CMake-051e0be742071fdd5eca2bc90f372422f27fd1fa.tar.gz CMake-051e0be742071fdd5eca2bc90f372422f27fd1fa.tar.bz2 | |
Merge branch 'restore-windows-resources-through-link' into release-3.11
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 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; } |