[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5480-g5b3cf3e
Stephen Kelly
steveire at gmail.com
Tue Nov 19 17:26:07 EST 2013
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 5b3cf3e1ef94661a70f387ca11afc9b58260fe2c (commit)
via d200b6393fedab085f887e8ea1638aa77839bbf8 (commit)
from 4c1415e82bcf7c5b54ea273a3c269af82a81d285 (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=5b3cf3e1ef94661a70f387ca11afc9b58260fe2c
commit 5b3cf3e1ef94661a70f387ca11afc9b58260fe2c
Merge: 4c1415e d200b63
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 19 17:26:05 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 19 17:26:05 2013 -0500
Merge topic 'use-generator-target' into next
d200b63 Fix line length.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d200b6393fedab085f887e8ea1638aa77839bbf8
commit d200b6393fedab085f887e8ea1638aa77839bbf8
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Nov 19 23:24:48 2013 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Nov 19 23:24:48 2013 +0100
Fix line length.
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index ee3c3ee..54cf14d 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -37,7 +37,8 @@ cmNinjaNormalTargetGenerator(cmGeneratorTarget* target)
, TargetNamePDB()
, TargetLinkLanguage(0)
{
- this->TargetLinkLanguage = target->Target->GetLinkerLanguage(this->GetConfigName());
+ this->TargetLinkLanguage = target->Target
+ ->GetLinkerLanguage(this->GetConfigName());
if (target->GetType() == cmTarget::EXECUTABLE)
target->Target->GetExecutableNames(this->TargetNameOut,
this->TargetNameReal,
diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx
index a83774c..8556565 100644
--- a/Source/cmNinjaUtilityTargetGenerator.cxx
+++ b/Source/cmNinjaUtilityTargetGenerator.cxx
@@ -18,7 +18,8 @@
#include "cmSourceFile.h"
#include "cmTarget.h"
-cmNinjaUtilityTargetGenerator::cmNinjaUtilityTargetGenerator(cmGeneratorTarget *target)
+cmNinjaUtilityTargetGenerator::cmNinjaUtilityTargetGenerator(
+ cmGeneratorTarget *target)
: cmNinjaTargetGenerator(target->Target) {}
cmNinjaUtilityTargetGenerator::~cmNinjaUtilityTargetGenerator() {}
-----------------------------------------------------------------------
Summary of changes:
Source/cmNinjaNormalTargetGenerator.cxx | 3 ++-
Source/cmNinjaUtilityTargetGenerator.cxx | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list