[Cmake-commits] CMake branch, master, updated. v3.11.0-496-g48d7aa2

Kitware Robot kwrobot at kitware.com
Fri Apr 13 10:05:06 EDT 2018


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, master has been updated
       via  48d7aa2868ed3a8c15f83d9639a9dfd633c7608b (commit)
       via  5ebbf2807b9ba4c42063c8243a04f7d8bfc094b6 (commit)
       via  e488f7387389ce290085742f8f908d35e3f976de (commit)
      from  07604a767ddb98b1020b546aa257bd7a965caf0a (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=48d7aa2868ed3a8c15f83d9639a9dfd633c7608b
commit 48d7aa2868ed3a8c15f83d9639a9dfd633c7608b
Merge: 07604a7 5ebbf28
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 13 13:54:29 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Apr 13 09:55:40 2018 -0400

    Merge topic 'update-kwsys'
    
    5ebbf2807b Merge branch 'upstream-KWSys' into update-kwsys
    e488f73873 KWSys 2018-04-12 (9da3e5bc)
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1953


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ebbf2807b9ba4c42063c8243a04f7d8bfc094b6
commit 5ebbf2807b9ba4c42063c8243a04f7d8bfc094b6
Merge: 4984d84 e488f73
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 12 13:05:38 2018 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 12 13:05:38 2018 -0400

    Merge branch 'upstream-KWSys' into update-kwsys
    
    * upstream-KWSys:
      KWSys 2018-04-12 (9da3e5bc)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e488f7387389ce290085742f8f908d35e3f976de
commit e488f7387389ce290085742f8f908d35e3f976de
Author:     KWSys Upstream <kwrobot at kitware.com>
AuthorDate: Thu Apr 12 13:04:50 2018 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 12 13:05:37 2018 -0400

    KWSys 2018-04-12 (9da3e5bc)
    
    Code extracted from:
    
        https://gitlab.kitware.com/utils/kwsys.git
    
    at commit 9da3e5bc847fa4187f42f60700e343a9ed09a161 (master).
    
    Upstream Shortlog
    -----------------
    
    Brad King (1):
          c7ef6c1b SystemInformation: Do not include unnecessary fenv.h

diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index 2b9d7b1..7426816 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -94,7 +94,6 @@ typedef int siginfo_t;
 #endif
 
 #ifdef __APPLE__
-#include <fenv.h>
 #include <mach/host_info.h>
 #include <mach/mach.h>
 #include <mach/mach_types.h>
@@ -114,7 +113,6 @@ typedef int siginfo_t;
 #endif
 
 #if defined(__linux) || defined(__sun) || defined(_SCO_DS)
-#include <fenv.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <sys/socket.h>

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

Summary of changes:
 Source/kwsys/SystemInformation.cxx |    2 --
 1 file changed, 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list