dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-08 08:40:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream-KWSys' into normalize-input-paths

Browse Source 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2024-10-24 (e1acde2e)
This commit is contained in:
Brad King
2024-10-24 16:08:43 -04:00
parent 063e98eb4b ede7f2afa6
commit e9bd437a43
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/kwsys/SystemTools.cxx
View File

@@ -3647,7 +3647,6 @@ std::string CollapseFullPathImpl(std::string const& in_path,
SystemTools::CheckTranslationPath(newPath); SystemTools::CheckTranslationPath(newPath);
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
newPath = SystemToolsStatics->GetActualCaseForPathCached(newPath);
SystemTools::ConvertToUnixSlashes(newPath); SystemTools::ConvertToUnixSlashes(newPath);
#endif #endif
// Return the reconstructed path. // Return the reconstructed path.
@@ -3762,6 +3761,15 @@ std::string SystemTools::GetActualCaseForPath(const std::string& p)
#endif #endif
} }
std::string SystemTools::GetActualCaseForPathCached(const std::string& p)
{
#ifdef _WIN32
return SystemToolsStatic::GetActualCaseForPathCached(p);
#else
return p;
#endif
}
const char* SystemTools::SplitPathRootComponent(const std::string& p, const char* SystemTools::SplitPathRootComponent(const std::string& p,
std::string* root) std::string* root)
{ {

1
Source/kwsys/SystemTools.hxx.in
View File

@@ -372,6 +372,7 @@ public:
* This does nothing on non-Windows systems but return the path. * This does nothing on non-Windows systems but return the path.
*/ */
static std::string GetActualCaseForPath(const std::string& path); static std::string GetActualCaseForPath(const std::string& path);
static std::string GetActualCaseForPathCached(const std::string& path);
/** /**
* Given the path to a program executable, get the directory part of * Given the path to a program executable, get the directory part of