diff options
| author | David Cole <david.cole@kitware.com> | 2012-03-20 13:34:56 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-03-20 13:34:56 (GMT) |
| commit | d69c2c582584efaa34aa6e2ffc5eb80bacef1324 (patch) | |
| tree | ebc2a71d89bbd92b5c4aa9643c40babd8ce390bf | |
| parent | 31c0bc021940420fcf383bde390c59beb2cd9b9c (diff) | |
| parent | c337c7e205259d5944b19c2a6d2007f490379ddc (diff) | |
| download | CMake-d69c2c582584efaa34aa6e2ffc5eb80bacef1324.zip CMake-d69c2c582584efaa34aa6e2ffc5eb80bacef1324.tar.gz CMake-d69c2c582584efaa34aa6e2ffc5eb80bacef1324.tar.bz2 | |
Merge topic 'ninja-generator'
c337c7e Ninja: Fix <OBJECT_DIR> substitution
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 6859445..2bad32c 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -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(), |