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 fcb2d3e17b5cfc3c0a98dad59a56e0022ba92541 (commit) via 01a8a201a7549369ea331516f8c6caa459074a8a (commit) from 0e71929e43279e3a806d476786a58d1c4e948083 (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 ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fcb2d3e17b5cfc3c0a98dad59a56e0022ba92541 commit fcb2d3e17b5cfc3c0a98dad59a56e0022ba92541 Merge: 0e71929 01a8a20 Author: Brad King <brad.k...@kitware.com> AuthorDate: Wed Mar 29 20:27:58 2017 +0000 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Wed Mar 29 16:28:06 2017 -0400 Stage topic '10749-aix-version' Topic-id: 23363 Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/645 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=01a8a201a7549369ea331516f8c6caa459074a8a commit 01a8a201a7549369ea331516f8c6caa459074a8a Author: Gregor Jasny <gja...@googlemail.com> AuthorDate: Wed Mar 29 21:14:36 2017 +0200 Commit: Gregor Jasny <gja...@googlemail.com> CommitDate: Wed Mar 29 21:20:23 2017 +0200 AIX: Properly detect host system version CMakeDetermineSystem.cmake uses "uname -r" to get CMAKE_HOST_SYSTEM_VERSION on AIX. AIX uses "uname -v" for the major version and "uname -r" for the minor version. Thanks to Chris Taylor for the suggested patch. Closes #10749 diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake index f34ec5d..20dcf1b 100644 --- a/Modules/CMakeDetermineSystem.cmake +++ b/Modules/CMakeDetermineSystem.cmake @@ -35,7 +35,15 @@ if(CMAKE_HOST_UNIX) find_program(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin ) if(CMAKE_UNAME) - exec_program(${CMAKE_UNAME} ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION) + if(CMAKE_HOST_SYSTEM_NAME STREQUAL "AIX") + exec_program(${CMAKE_UNAME} ARGS -v OUTPUT_VARIABLE _CMAKE_HOST_SYSTEM_MAJOR_VERSION) + exec_program(${CMAKE_UNAME} ARGS -r OUTPUT_VARIABLE _CMAKE_HOST_SYSTEM_MINOR_VERSION) + set(CMAKE_HOST_SYSTEM_VERSION "${_CMAKE_HOST_SYSTEM_MAJOR_VERSION}.${_CMAKE_HOST_SYSTEM_MINOR_VERSION}") + unset(_CMAKE_HOST_SYSTEM_MAJOR_VERSION) + unset(_CMAKE_HOST_SYSTEM_MINOR_VERSION) + else() + exec_program(${CMAKE_UNAME} ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION) + endif() if(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|CYGWIN.*|Darwin|^GNU$") exec_program(${CMAKE_UNAME} ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR RETURN_VALUE val) ----------------------------------------------------------------------- Summary of changes: Modules/CMakeDetermineSystem.cmake | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits