[Cmake-commits] CMake branch, next, updated. v2.8.8-3440-g18b72d7

[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  18b72d7ca29847279684bc29a5ab6d4625a1356e (commit)
       via  4bb94c9fbd948ec18a3b40fef8378dda76cec0f0 (commit)
       via  bb3675999f26af14c25e652f9c614432156f3526 (commit)
      from  3de1b93734635585aeb47e9ed162ff45b0c2269e (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=18b72d7ca29847279684bc29a5ab6d4625a1356e
commit 18b72d7ca29847279684bc29a5ab6d4625a1356e
Merge: 3de1b93 4bb94c9
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Wed Jul 11 04:25:32 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 11 04:25:32 2012 -0400

    Merge topic 'ninja-rspfile-link-libraries' into next
    
    4bb94c9 Ninja: sysconf() is declared in unistd.h
    bb36759 Ninja: enable response file support on Mac (length 262144)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4bb94c9fbd948ec18a3b40fef8378dda76cec0f0
commit 4bb94c9fbd948ec18a3b40fef8378dda76cec0f0
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Wed Jul 11 10:15:53 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Wed Jul 11 10:20:46 2012 +0200

    Ninja: sysconf() is declared in unistd.h

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 3e5ac41..be7739e 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -20,6 +20,11 @@
 #include <assert.h>
 #include <algorithm>
 
+#ifndef _WIN32
+#include <unistd.h>
+#endif
+
+
 cmNinjaNormalTargetGenerator::
 cmNinjaNormalTargetGenerator(cmTarget* target)
   : cmNinjaTargetGenerator(target)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb3675999f26af14c25e652f9c614432156f3526
commit bb3675999f26af14c25e652f9c614432156f3526
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Wed Jul 11 10:11:01 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Wed Jul 11 10:11:01 2012 +0200

    Ninja: enable response file support on Mac (length 262144)

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index f6f235c..3e5ac41 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -488,8 +488,8 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
                                  GetRuleCmdLength(this->LanguageLinkerRule());
 #ifdef _WIN32
   int commandLineLengthLimit = 8000 - linkRuleLength;
-#elif __linux
-  // for instance ARG_MAX is 2096152 on Ubuntu
+#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;
 #else
   int commandLineLengthLimit = -1;

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

Summary of changes:
 Source/cmNinjaNormalTargetGenerator.cxx |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake