[Cmake-commits] CMake branch, next, updated. v2.8.8-3461-g4163176

Peter Kuemmel syntheticpp at gmx.net
Fri Jul 13 09:23:14 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  416317664f032a506e0447a0e9e084680892a40b (commit)
       via  42592966c514015cef070d6b24a0c29f22ac2999 (commit)
      from  f92c8a4c48de5f77e98cc9258fa30b0955eae7e1 (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=416317664f032a506e0447a0e9e084680892a40b
commit 416317664f032a506e0447a0e9e084680892a40b
Merge: f92c8a4 4259296
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Fri Jul 13 09:23:11 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 13 09:23:11 2012 -0400

    Merge topic 'ninja-rspfile-link-libraries' into next
    
    4259296 Ninja: fix sytle


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42592966c514015cef070d6b24a0c29f22ac2999
commit 42592966c514015cef070d6b24a0c29f22ac2999
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Fri Jul 13 15:21:33 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Fri Jul 13 15:22:03 2012 +0200

    Ninja: fix sytle

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index cc49e39..5c9bf78 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -495,7 +495,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
   int commandLineLengthLimit = 8000 - linkRuleLength;
 #elif defined(__linux) || defined(__APPLE__)
   // for instance ARG_MAX is 2096152 on Ubuntu or 262144 on Mac
-  int commandLineLengthLimit = ((int)sysconf(_SC_ARG_MAX)) - linkRuleLength - 1000;
+  int commandLineLengthLimit = ((int)sysconf(_SC_ARG_MAX))
+                                    - linkRuleLength - 1000;
 #else
   int commandLineLengthLimit = -1;
 #endif

-----------------------------------------------------------------------

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