On win32 path is all in lower case now
This commit is contained in:
parent
c15ad5c98d
commit
36e7b5567a
@ -252,16 +252,10 @@ bool cmCacheManager::LoadCache(const char* path,
|
|||||||
{
|
{
|
||||||
std::string currentcwd = path;
|
std::string currentcwd = path;
|
||||||
std::string oldcwd = this->GetCacheValue("CMAKE_CACHEFILE_DIR");
|
std::string oldcwd = this->GetCacheValue("CMAKE_CACHEFILE_DIR");
|
||||||
if ( currentcwd[0] >= 'A' && currentcwd[0] <= 'Z' &&
|
#ifdef _WIN32
|
||||||
currentcwd[1] == ':' )
|
currentcwd = cmSystemTools::LowerCase(currentcwd);
|
||||||
{
|
oldcwd = cmSystemTools::LowerCase(oldcwd);
|
||||||
currentcwd[0] = currentcwd[0] - 'A' + 'a';
|
#endif // _WIN32
|
||||||
}
|
|
||||||
if ( oldcwd[0] >= 'A' && oldcwd[0] <= 'Z' &&
|
|
||||||
oldcwd[1] == ':' )
|
|
||||||
{
|
|
||||||
oldcwd[0] = oldcwd[0] - 'A' + 'a';
|
|
||||||
}
|
|
||||||
cmSystemTools::ConvertToUnixSlashes(currentcwd);
|
cmSystemTools::ConvertToUnixSlashes(currentcwd);
|
||||||
if(cmSystemTools::CollapseFullPath(oldcwd.c_str())
|
if(cmSystemTools::CollapseFullPath(oldcwd.c_str())
|
||||||
!= cmSystemTools::CollapseFullPath(currentcwd.c_str()))
|
!= cmSystemTools::CollapseFullPath(currentcwd.c_str()))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user