From 56632ddaa3f3476d69c6facccc2a9b195fbfee58 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 8 Nov 2024 18:08:52 -0500 Subject: [PATCH] cmSystemTools: Remove redundant filesystem access on Windows Since commit 823e1df54c (cmSystemTools: Implement GetRealPath on Windows, 2024-11-04), GetRealPath now returns the actual case on disk. It also returns the original path on failure. --- Source/cmSystemTools.cxx | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index d241a938ff..189b5ef4f5 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -2689,12 +2689,9 @@ void cmSystemTools::FindCMakeResources(const char* argv0) (void)argv0; // ignore this on windows wchar_t modulepath[_MAX_PATH]; ::GetModuleFileNameW(nullptr, modulepath, sizeof(modulepath)); - std::string path = cmsys::Encoding::ToNarrow(modulepath); - std::string realPath = cmSystemTools::GetRealPath(path, nullptr); - if (realPath.empty()) { - realPath = path; - } - exe_dir = cmSystemTools::GetFilenamePath(realPath); + std::string exe = cmsys::Encoding::ToNarrow(modulepath); + exe = cmSystemTools::GetRealPath(exe); + exe_dir = cmSystemTools::GetFilenamePath(exe); #elif defined(__APPLE__) (void)argv0; // ignore this on OS X # define CM_EXE_PATH_LOCAL_SIZE 16384 @@ -2738,7 +2735,6 @@ void cmSystemTools::FindCMakeResources(const char* argv0) // ??? } #endif - exe_dir = cmSystemTools::GetActualCaseForPath(exe_dir); cmSystemToolsCMakeCommand = cmStrCat(exe_dir, "/cmake", cmSystemTools::GetExecutableExtension()); #ifdef CMAKE_BOOTSTRAP