[Cmake-commits] CMake branch, next, updated. v2.8.12.1-4914-g325cbd6

[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  325cbd636aef5399a96b48f04da072829c3c3891 (commit)
       via  328421fc294372ddffbd590d7813713ed59a0d57 (commit)
      from  33ea043b7d4e31ba2cdf0e2ca61289099a235a16 (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=325cbd636aef5399a96b48f04da072829c3c3891
commit 325cbd636aef5399a96b48f04da072829c3c3891
Merge: 33ea043 328421f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 8 10:05:20 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 8 10:05:20 2013 -0500

    Merge topic 'cmake-internal-locations' into next
    
    328421f cmSystemTools: Fix _NSGetExecutablePath calls on OS X 10.3


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=328421fc294372ddffbd590d7813713ed59a0d57
commit 328421fc294372ddffbd590d7813713ed59a0d57
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 8 09:53:41 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Nov 8 10:03:52 2013 -0500

    cmSystemTools: Fix _NSGetExecutablePath calls on OS X 10.3
    
    The buffer size argument is a different type on OS X 10.3 versus
    OS X 10.4 and later.  Choose the type based on the OS X version.
    
    While at it, use a local macro to avoid duplicating the local buffer
    length.

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index a45cc0a..f5376eb 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -2031,8 +2031,14 @@ void cmSystemTools::FindCMakeResources(const char* argv0)
   exe_dir = cmSystemTools::GetFilenamePath(modulepath);
 #elif defined(__APPLE__)
   (void)argv0; // ignore this on OS X
-  char exe_path_local[16384];
-  uint32_t exe_path_size = 16384;
+# define CM_EXE_PATH_LOCAL_SIZE 16384
+  char exe_path_local[CM_EXE_PATH_LOCAL_SIZE];
+# if defined(MAC_OS_X_VERSION_10_3) && !defined(MAC_OS_X_VERSION_10_4)
+  unsigned long exe_path_size = CM_EXE_PATH_LOCAL_SIZE;
+# else
+  uint32_t exe_path_size = CM_EXE_PATH_LOCAL_SIZE;
+# endif
+# undef CM_EXE_PATH_LOCAL_SIZE
   char* exe_path = exe_path_local;
   if(_NSGetExecutablePath(exe_path, &exe_path_size) < 0)
     {

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

Summary of changes:
 Source/cmSystemTools.cxx |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake