mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-11 08:20:18 -06:00
KWSys 2024-10-24 (e1acde2e)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit e1acde2e48813c276c5777d6adae6bcdc3b03923 (master).
Upstream Shortlog
-----------------
Brad King (2):
4feb470a SystemTools: Remove GetActualCaseForPath from CollapseFullPath
741c9c96 SystemTools: Expose GetActualCaseForPathCached publicly
This commit is contained in:
committed by
Brad King
parent
5c18d48fda
commit
ede7f2afa6
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user