[Cmake-commits] CMake branch, next, updated. v3.0.1-5268-g164c6ca
Brad King
brad.king at kitware.com
Wed Sep 10 09:09:00 EDT 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 164c6ca15d00d5bf20b0acbe1b15c7656f64a9cf (commit)
via 89d7a5a417dccbdc97107d30a6678e94ced9ca5d (commit)
via e03b474fa83a1d17f0c74fc0b046a2eeedf13b60 (commit)
from 6b422b6bbd126611469a085b5bc9a5956669b6a9 (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=164c6ca15d00d5bf20b0acbe1b15c7656f64a9cf
commit 164c6ca15d00d5bf20b0acbe1b15c7656f64a9cf
Merge: 6b422b6 89d7a5a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 10 09:08:59 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 10 09:08:59 2014 -0400
Merge topic 'fix-gnu-hurd-host-detection' into next
89d7a5a4 Fix CMAKE_HOST_SYSTEM_PROCESSOR detection on GNU/Hurd (#15147)
e03b474f CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89d7a5a417dccbdc97107d30a6678e94ced9ca5d
commit 89d7a5a417dccbdc97107d30a6678e94ced9ca5d
Author: Felix Geyer <debfx at ubuntu.com>
AuthorDate: Wed Sep 10 08:55:00 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 10 09:06:33 2014 -0400
Fix CMAKE_HOST_SYSTEM_PROCESSOR detection on GNU/Hurd (#15147)
On Debian GNU/Hurd 'uname -p' prints "unknown", so use 'uname -m'
instead.
diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
index 1c0941a..fe292ea 100644
--- a/Modules/CMakeDetermineSystem.cmake
+++ b/Modules/CMakeDetermineSystem.cmake
@@ -47,7 +47,7 @@ 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.*|Darwin")
+ if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*|Darwin|^GNU$")
exec_program(uname ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
RETURN_VALUE val)
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin" AND
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeDetermineSystem.cmake | 2 +-
Source/CMakeVersion.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list