mirror of
https://github.com/Kitware/CMake.git
synced 2026-04-24 07:08:38 -05:00
BUG: MSYS makefile shell needs posix paths to executables in some cases and it does not hurt to do it always.
This commit is contained in:
@@ -40,6 +40,7 @@ cmLocalGenerator::cmLocalGenerator()
|
||||
this->Parent = 0;
|
||||
this->WindowsShell = false;
|
||||
this->WindowsVSIDE = false;
|
||||
this->MSYSShell = false;
|
||||
this->IgnoreLibPrefix = false;
|
||||
this->UseRelativePaths = false;
|
||||
this->Configured = false;
|
||||
@@ -2007,6 +2008,18 @@ std::string cmLocalGenerator::Convert(const char* source,
|
||||
{
|
||||
cmSystemTools::SetForceUnixPaths(true);
|
||||
}
|
||||
|
||||
// For the MSYS shell convert drive letters to posix paths, so
|
||||
// that c:/some/path becomes /c/some/path. This is needed to
|
||||
// avoid problems with the shell path translation.
|
||||
if(this->MSYSShell)
|
||||
{
|
||||
if(result.size() > 2 && result[1] == ':')
|
||||
{
|
||||
result[1] = result[0];
|
||||
result[0] = '/';
|
||||
}
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user