Construct the full path before escaping it.
Should fix some dashboard errors.
This commit is contained in:
parent
f9383a9898
commit
ca403b8c43
|
@ -489,11 +489,10 @@ cmNinjaTargetGenerator
|
||||||
cmLocalGenerator::RuleVariables compileObjectVars;
|
cmLocalGenerator::RuleVariables compileObjectVars;
|
||||||
std::string lang = language;
|
std::string lang = language;
|
||||||
compileObjectVars.Language = lang.c_str();
|
compileObjectVars.Language = lang.c_str();
|
||||||
std::string escapedSourceFileName =
|
|
||||||
this->LocalGenerator->ConvertToOutputFormat(
|
|
||||||
sourceFileName.c_str(), cmLocalGenerator::SHELL);
|
|
||||||
|
|
||||||
if (!cmSystemTools::FileIsFullPath(escapedSourceFileName.c_str()))
|
std::string escapedSourceFileName = sourceFileName;
|
||||||
|
|
||||||
|
if (!cmSystemTools::FileIsFullPath(sourceFileName.c_str()))
|
||||||
{
|
{
|
||||||
escapedSourceFileName = cmSystemTools::CollapseFullPath(
|
escapedSourceFileName = cmSystemTools::CollapseFullPath(
|
||||||
escapedSourceFileName.c_str(),
|
escapedSourceFileName.c_str(),
|
||||||
|
@ -501,6 +500,10 @@ cmNinjaTargetGenerator
|
||||||
GetHomeOutputDirectory());
|
GetHomeOutputDirectory());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
escapedSourceFileName =
|
||||||
|
this->LocalGenerator->ConvertToOutputFormat(
|
||||||
|
escapedSourceFileName.c_str(), cmLocalGenerator::SHELL);
|
||||||
|
|
||||||
compileObjectVars.Source = escapedSourceFileName.c_str();
|
compileObjectVars.Source = escapedSourceFileName.c_str();
|
||||||
compileObjectVars.Object = objectFileName.c_str();
|
compileObjectVars.Object = objectFileName.c_str();
|
||||||
compileObjectVars.Flags = vars["FLAGS"].c_str();
|
compileObjectVars.Flags = vars["FLAGS"].c_str();
|
||||||
|
|
Loading…
Reference in New Issue