[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-602-ga04f037

[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  a04f037c1c2286856e26f7190fdf7a816ac37cc6 (commit)
       via  c1aaf8a61defe3e01e8526b99d8919b9618d1ba9 (commit)
      from  d8227ed0bd89990b39407dd2e0486bea2c337d7e (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=a04f037c1c2286856e26f7190fdf7a816ac37cc6
commit a04f037c1c2286856e26f7190fdf7a816ac37cc6
Merge: d8227ed c1aaf8a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 27 10:32:50 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 27 10:32:50 2017 -0500

    Merge topic 'cmake-host-system-name' into next
    
    c1aaf8a6 Fix CMAKE_HOST_SYSTEM_NAME on SunOS


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1aaf8a61defe3e01e8526b99d8919b9618d1ba9
commit c1aaf8a61defe3e01e8526b99d8919b9618d1ba9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 27 10:30:20 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 27 10:30:45 2017 -0500

    Fix CMAKE_HOST_SYSTEM_NAME on SunOS
    
    In commit 0bbd993f (Make CMAKE_HOST_SYSTEM_NAME available in scripting
    context, 2016-12-26) we added a call to `uname` that checks for a zero
    return value.  However, on Solaris the `uname(2)` manual [1] says that
    on success a non-negative value is returned.  Fix our return code check
    so that we detect the `SunOS` name correctly.
    
    [1] https://docs.oracle.com/cd/E53394_01/html/E54765/uname-2.html

diff --git a/Source/cmStateSnapshot.cxx b/Source/cmStateSnapshot.cxx
index 80e494b..d2c9d73 100644
--- a/Source/cmStateSnapshot.cxx
+++ b/Source/cmStateSnapshot.cxx
@@ -308,7 +308,7 @@ void cmStateSnapshot::SetDefaultDefinitions()
   this->SetDefinition("CMAKE_HOST_UNIX", "1");
 
   struct utsname uts_name;
-  if (uname(&uts_name) == 0) {
+  if (uname(&uts_name) >= 0) {
     this->SetDefinition("CMAKE_HOST_SYSTEM_NAME", uts_name.sysname);
   }
 #endif

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

Summary of changes:
 Source/cmStateSnapshot.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake