Merge branch 'upstream-KWSys' into normalize-input-paths
# By KWSys Upstream * upstream-KWSys: KWSys 2024-10-24 (e1acde2e)
This commit is contained in:
commit
e9bd437a43
@ -3647,7 +3647,6 @@ std::string CollapseFullPathImpl(std::string const& in_path,
|
||||
SystemTools::CheckTranslationPath(newPath);
|
||||
#endif
|
||||
#ifdef _WIN32
|
||||
newPath = SystemToolsStatics->GetActualCaseForPathCached(newPath);
|
||||
SystemTools::ConvertToUnixSlashes(newPath);
|
||||
#endif
|
||||
// Return the reconstructed path.
|
||||
@ -3762,6 +3761,15 @@ std::string SystemTools::GetActualCaseForPath(const std::string& p)
|
||||
#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,
|
||||
std::string* root)
|
||||
{
|
||||
|
@ -372,6 +372,7 @@ public:
|
||||
* This does nothing on non-Windows systems but return the 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
|
||||
|
Loading…
Reference in New Issue
Block a user