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

Ninja: Simplify generation of custom target logical path 

In `AppendTargetOutputs` we generate a logical build target name for
each UTILITY command.  Simplify the logic to avoid testing the result
of `ConvertToNinjaPath`.
This commit is contained in:
Brad King 2016-05-16 15:30:53 -04:00
parent 7d2a0aa76c
commit 5ca72750c8
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmGlobalNinjaGenerator.cxx
View File

@ -836,15 +836,10 @@ void cmGlobalNinjaGenerator::AppendTargetOutputs(
} }
case cmState::OBJECT_LIBRARY: case cmState::OBJECT_LIBRARY:
case cmState::UTILITY: { case cmState::UTILITY: {
std::string path = this->ConvertToNinjaPath( std::string path =
target->GetLocalGenerator()->GetCurrentBinaryDirectory()); target->GetLocalGenerator()->GetCurrentBinaryDirectory() +
if (path.empty() || path == ".") std::string("/") + target->GetName();
outputs.push_back(target->GetName()); outputs.push_back(this->ConvertToNinjaPath(path));
else {
path += "/";
path += target->GetName();
outputs.push_back(path);
}
break; break;
} }