[Cmake-commits] CMake branch, next, updated. v2.8.4-1490-g50a7b0a

[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  50a7b0aed97e37178200afa94303d753001c893c (commit)
       via  0bfabf967fa6efdcac40f3f2e3731795eaab9256 (commit)
      from  531553b5a3b92f36e952077bc3e577f96186f94d (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=50a7b0aed97e37178200afa94303d753001c893c
commit 50a7b0aed97e37178200afa94303d753001c893c
Merge: 531553b 0bfabf9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 2 10:46:56 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 2 10:46:56 2011 -0400

    Merge topic 'OpenBSD-host-processor-issue-12143' into next
    
    0bfabf9 OpenBSD: Use 'arch -s' for host processor (#12143)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0bfabf967fa6efdcac40f3f2e3731795eaab9256
commit 0bfabf967fa6efdcac40f3f2e3731795eaab9256
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 2 10:33:18 2011 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 2 10:33:18 2011 -0400

    OpenBSD: Use 'arch -s' for host processor (#12143)
    
    On OpenBSD 'uname -p' returns a long descriptive name for the processor.
    Use 'arch -s' instead to get a short cpu name.
    
    Suggested-by: Stuart Henderson

diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
index 0e65bce..7ae3775 100644
--- a/Modules/CMakeDetermineSystem.cmake
+++ b/Modules/CMakeDetermineSystem.cmake
@@ -50,14 +50,17 @@ IF(CMAKE_HOST_UNIX)
     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|CYGWIN.*")
+    ELSEIF(CMAKE_HOST_SYSTEM_NAME MATCHES "OpenBSD")
+      EXEC_PROGRAM(arch ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
+        RETURN_VALUE val)
+    ELSE()
       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|CYGWIN.*")
+    ENDIF()
     # 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 |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake