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

Merge topic 'ninja-generator' 

c337c7e Ninja: Fix <OBJECT_DIR> substitution
This commit is contained in:
David Cole 2012-03-20 09:34:56 -04:00 committed by CMake Topic Stage
parent 31c0bc0219 c337c7e205
commit d69c2c5825
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmNinjaNormalTargetGenerator.cxx
View File

@ -141,7 +141,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(),