Commit c337c7e2 authored by Peter Kuemmel's avatar Peter Kuemmel Committed by Brad King
Browse files

Ninja: Fix <OBJECT_DIR> substitution

Don't forget the subdirectories.
parent 572994bd
......@@ -131,7 +131,10 @@ cmNinjaNormalTargetGenerator
vars.CMTarget = this->GetTarget();
vars.Language = this->TargetLinkLanguage;
vars.Objects = "$in";
std::string objdir = cmake::GetCMakeFilesDirectoryPostSlash();
std::string objdir =
this->GetLocalGenerator()->GetHomeRelativeOutputPath();
objdir += objdir.empty() ? "" : "/";
objdir += cmake::GetCMakeFilesDirectoryPostSlash();
objdir += this->GetTargetName();
objdir += ".dir";
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