[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-685-g6c3c6fb

Brad King brad.king at kitware.com
Mon Nov 17 09:43:30 EST 2014


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  6c3c6fba6665be00517b42bd88554f528d83c072 (commit)
       via  480ed9cdec30d59991f6639e79bc5609634a1b47 (commit)
      from  29cfa91316a76e6bd5ab5b55bc2d5608bdfa117c (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=6c3c6fba6665be00517b42bd88554f528d83c072
commit 6c3c6fba6665be00517b42bd88554f528d83c072
Merge: 29cfa91 480ed9c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 17 09:43:29 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 17 09:43:29 2014 -0500

    Merge topic 'kwsys-SharedForward-vs14' into next
    
    480ed9cd KWSys SharedForward: Hard-code the ldpath buffer size to below VS 14 limit


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=480ed9cdec30d59991f6639e79bc5609634a1b47
commit 480ed9cdec30d59991f6639e79bc5609634a1b47
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 14 13:49:32 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Nov 14 13:56:58 2014 -0500

    KWSys SharedForward: Hard-code the ldpath buffer size to below VS 14 limit
    
    Visual Studio 14 (2015) complains if a static character array is
    declared with more than 65535 elements.  This limit should be large
    enough for SharedForward clients, so just hard-code that instead of
    trying to compute a limit.

diff --git a/Source/kwsys/SharedForward.h.in b/Source/kwsys/SharedForward.h.in
index 7ff29b4..c6f345f 100644
--- a/Source/kwsys/SharedForward.h.in
+++ b/Source/kwsys/SharedForward.h.in
@@ -813,7 +813,7 @@ static void kwsys_shared_forward_print_failure(char const* const* argv)
 }
 
 /* Static storage space to store the updated environment variable.  */
-static char kwsys_shared_forward_ldpath[KWSYS_SHARED_FORWARD_MAXPATH*16] = KWSYS_SHARED_FORWARD_LDPATH "=";
+static char kwsys_shared_forward_ldpath[65535] = KWSYS_SHARED_FORWARD_LDPATH "=";
 
 /*--------------------------------------------------------------------------*/
 /* Main driver function to be called from main.  */

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

Summary of changes:


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list