Commit d69c2c58 authored by David Cole's avatar David Cole Committed by Kitware Robot
Browse files

Merge topic 'ninja-generator'

c337c7e2 Ninja: Fix <OBJECT_DIR> substitution
parents 31c0bc02 c337c7e2
...@@ -141,7 +141,10 @@ cmNinjaNormalTargetGenerator ...@@ -141,7 +141,10 @@ cmNinjaNormalTargetGenerator
vars.CMTarget = this->GetTarget(); vars.CMTarget = this->GetTarget();
vars.Language = this->TargetLinkLanguage; vars.Language = this->TargetLinkLanguage;
vars.Objects = "$in"; vars.Objects = "$in";
std::string objdir = cmake::GetCMakeFilesDirectoryPostSlash(); std::string objdir =
this->GetLocalGenerator()->GetHomeRelativeOutputPath();
objdir += objdir.empty() ? "" : "/";
objdir += cmake::GetCMakeFilesDirectoryPostSlash();
objdir += this->GetTargetName(); objdir += this->GetTargetName();
objdir += ".dir"; objdir += ".dir";
objdir = this->GetLocalGenerator()->Convert(objdir.c_str(), objdir = this->GetLocalGenerator()->Convert(objdir.c_str(),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment