[Cmake-commits] CMake branch, next, updated. v2.8.7-3243-g72fd735
Brad King
brad.king at kitware.com
Mon Mar 19 10:09:31 EDT 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 72fd7358d2dc1af465d963d681e4814a1b0f7dea (commit)
via d12a7dd8784032cd855e68ae8bee41f8ad2239ac (commit)
from 24dfb445d2609f8b74a6d250ae1b7e58cf882818 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72fd7358d2dc1af465d963d681e4814a1b0f7dea
commit 72fd7358d2dc1af465d963d681e4814a1b0f7dea
Merge: 24dfb44 d12a7dd
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 19 10:09:26 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 19 10:09:26 2012 -0400
Merge topic 'ninja-generator' into next
d12a7dd Ninja: Fix line-too-long style error
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d12a7dd8784032cd855e68ae8bee41f8ad2239ac
commit d12a7dd8784032cd855e68ae8bee41f8ad2239ac
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 19 10:08:36 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 19 10:08:36 2012 -0400
Ninja: Fix line-too-long style error
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index d8749aa..35f3baf 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -131,7 +131,8 @@ cmNinjaNormalTargetGenerator
vars.CMTarget = this->GetTarget();
vars.Language = this->TargetLinkLanguage;
vars.Objects = "$in";
- std::string objdir = this->GetLocalGenerator()->GetHomeRelativeOutputPath();
+ std::string objdir =
+ this->GetLocalGenerator()->GetHomeRelativeOutputPath();
objdir += objdir.empty() ? "" : "/";
objdir += cmake::GetCMakeFilesDirectoryPostSlash();
objdir += this->GetTargetName();
-----------------------------------------------------------------------
Summary of changes:
Source/cmNinjaNormalTargetGenerator.cxx | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list