[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-777-gc16c955

[Brad King]

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  c16c955d101ee9a9e772e29c7774b5c5fa318bba (commit)
       via  6c90f0a6938cf2ed2190db34ebc918a9e29fe4bf (commit)
      from  4533a7d1ff9a005c83386e80223236b65bc2b739 (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=c16c955d101ee9a9e772e29c7774b5c5fa318bba
commit c16c955d101ee9a9e772e29c7774b5c5fa318bba
Merge: 4533a7d 6c90f0a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 10 09:42:11 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 10 09:42:11 2014 -0400

    Merge topic 'ninja-command-line-length-haiku' into next
    
    6c90f0a6 Ninja: Detect command-line length limit on Haiku


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c90f0a6938cf2ed2190db34ebc918a9e29fe4bf
commit 6c90f0a6938cf2ed2190db34ebc918a9e29fe4bf
Author:     Adrien Destugues <pulkomandy at pulkomandy.tk>
AuthorDate: Mon Mar 3 15:47:08 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 10 09:42:38 2014 -0400

    Ninja: Detect command-line length limit on Haiku

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index a49fc2d..c24c5e0 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -591,7 +591,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
       cmSystemTools::GetEnv(forceRspFile) == 0) {
 #ifdef _WIN32
     commandLineLengthLimit = 8000 - linkRuleLength;
-#elif defined(__linux) || defined(__APPLE__)
+#elif defined(__linux) || defined(__APPLE__) || defined(__HAIKU__)
     // for instance ARG_MAX is 2096152 on Ubuntu or 262144 on Mac
     commandLineLengthLimit = ((int)sysconf(_SC_ARG_MAX))-linkRuleLength-1000;
 #else

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

Summary of changes:
 Source/cmNinjaNormalTargetGenerator.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake