[Cmake-commits] CMake branch, next, updated. v2.8.8-3459-gf92c8a4

[Peter Kuemmel]

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  f92c8a4c48de5f77e98cc9258fa30b0955eae7e1 (commit)
       via  379984883665d86a9c593acda8b24713e200f9ba (commit)
      from  9fd3785db6a63d0eb6ff1210369e6baf26b1cfa4 (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=f92c8a4c48de5f77e98cc9258fa30b0955eae7e1
commit f92c8a4c48de5f77e98cc9258fa30b0955eae7e1
Merge: 9fd3785 3799848
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Fri Jul 13 03:01:57 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 13 03:01:57 2012 -0400

    Merge topic 'ninja-rspfile-link-libraries' into next
    
    3799848 Ninja: fix GCC 4.7 warning -Wconversion


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=379984883665d86a9c593acda8b24713e200f9ba
commit 379984883665d86a9c593acda8b24713e200f9ba
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Fri Jul 13 08:58:37 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Fri Jul 13 08:58:37 2012 +0200

    Ninja: fix GCC 4.7 warning -Wconversion

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index be7739e..cc49e39 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -495,7 +495,7 @@ 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 = 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 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake