kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Construct the full path before escaping it. 

Should fix some dashboard errors.
This commit is contained in:
Stephen Kelly 2012-06-20 22:47:41 +02:00
parent f9383a9898
commit ca403b8c43
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmNinjaTargetGenerator.cxx
View File

@ -489,11 +489,10 @@ cmNinjaTargetGenerator
cmLocalGenerator::RuleVariables compileObjectVars;
std::string lang = language;
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.c_str(),
@ -501,6 +500,10 @@ cmNinjaTargetGenerator
GetHomeOutputDirectory());
}
escapedSourceFileName =
this->LocalGenerator->ConvertToOutputFormat(
escapedSourceFileName.c_str(), cmLocalGenerator::SHELL);
compileObjectVars.Source = escapedSourceFileName.c_str();
compileObjectVars.Object = objectFileName.c_str();
compileObjectVars.Flags = vars["FLAGS"].c_str();