[Cmake-commits] CMake branch, next, updated. v2.8.2-892-g31e6b9e

[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  31e6b9e72e5450c5da3625e50984417d9c0b06ac (commit)
       via  2412d9bc0eb2a70defe860672ad3f0de60bae28d (commit)
      from  0e2bd2bb1e3fb2af2b9cfbaad6f9363f8d42a52a (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=31e6b9e72e5450c5da3625e50984417d9c0b06ac
commit 31e6b9e72e5450c5da3625e50984417d9c0b06ac
Merge: 0e2bd2b 2412d9b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 21 17:37:11 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 21 17:37:11 2010 -0400

    Merge topic 'cygwin-system-processor' into next
    
    2412d9b Use 'uname -m' for processor on Cygwin (#10774)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2412d9bc0eb2a70defe860672ad3f0de60bae28d
commit 2412d9bc0eb2a70defe860672ad3f0de60bae28d
Author:     Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
AuthorDate: Tue Sep 21 17:32:49 2010 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 21 17:32:49 2010 -0400

    Use 'uname -m' for processor on Cygwin (#10774)
    
    POSIX requires 'uname -m' but not 'uname -p':
    
      http://www.opengroup.org/onlinepubs/9699919799/utilities/uname.html
    
    Indeed Cygwin 'uname -p' returns "unknown".

diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
index 5589dfc..0e65bce 100644
--- a/Modules/CMakeDetermineSystem.cmake
+++ b/Modules/CMakeDetermineSystem.cmake
@@ -47,17 +47,17 @@ 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")
+    IF(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*")
       EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
         RETURN_VALUE val)
-    ELSE(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
+    ELSE(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*")
       EXEC_PROGRAM(uname ARGS -p OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
         RETURN_VALUE val)
       IF("${val}" GREATER 0)
         EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
           RETURN_VALUE val)
       ENDIF("${val}" GREATER 0)
-    ENDIF(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
+    ENDIF(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*")
     # check the return of the last uname -m or -p 
     IF("${val}" GREATER 0)
         SET(CMAKE_HOST_SYSTEM_PROCESSOR "unknown")

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

Summary of changes:
 Modules/CMakeDetermineSystem.cmake |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake