[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7182-g27164dc

[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  27164dcb470b88130bc50d0395899dcef6e8265d (commit)
       via  9d2a0900ed48eb4ae2df0e7672b9ede5af28e193 (commit)
      from  7cebca8c0993646047c162b06496696f7e791cc1 (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=27164dcb470b88130bc50d0395899dcef6e8265d
commit 27164dcb470b88130bc50d0395899dcef6e8265d
Merge: 7cebca8 9d2a090
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 20 11:06:43 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 20 11:06:43 2014 -0500

    Merge topic 'osx-host-arch' into next
    
    9d2a0900 OS X: Use 'uname -m' for processor (#14712)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d2a0900ed48eb4ae2df0e7672b9ede5af28e193
commit 9d2a0900ed48eb4ae2df0e7672b9ede5af28e193
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 20 09:59:03 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 20 10:55:19 2014 -0500

    OS X: Use 'uname -m' for processor (#14712)
    
    In commit 2412d9bc (Use 'uname -m' for processor on Cygwin, 2010-09-21)
    it was pointed out that POSIX requires 'uname -m' but not 'uname -p':
    
      http://www.opengroup.org/onlinepubs/9699919799/utilities/uname.html
    
    On OS X x86_64, 'uname -p' returns i386 while 'uname -m' returns x86_64.
    Since the latter is the POSIX-compliant option trust its value.
    However, on OS X ppc, 'uname -m' returns 'Power Macintosh' so add a
    special-case to convert that to 'powerpc'.

diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
index 7756273..f1bad99 100644
--- a/Modules/CMakeDetermineSystem.cmake
+++ b/Modules/CMakeDetermineSystem.cmake
@@ -47,9 +47,14 @@ if(CMAKE_HOST_UNIX)
   if(CMAKE_UNAME)
     exec_program(uname ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_NAME)
     exec_program(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION)
-    if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*")
+    if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*|Darwin")
       exec_program(uname ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
         RETURN_VALUE val)
+      if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND
+         CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "Power Macintosh")
+        # OS X ppc 'uname -m' may report 'Power Macintosh' instead of 'powerpc'
+        set(CMAKE_HOST_SYSTEM_PROCESSOR "powerpc")
+      endif()
     elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "OpenBSD")
       exec_program(arch ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
         RETURN_VALUE val)

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

Summary of changes:
 Modules/CMakeDetermineSystem.cmake |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake