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 0baf4365ba53001e3d528d67c46a6926cc675b37 (commit) via 3673b96507199da13b0726e57491b4ee46f86330 (commit) via 424fb9589f408a06f499ed038043554f70666df2 (commit) from c024b9ecd0352a3f87168ec821169a7ce1dc8fbf (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=0baf4365ba53001e3d528d67c46a6926cc675b37 commit 0baf4365ba53001e3d528d67c46a6926cc675b37 Merge: c024b9e 3673b96 Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Nov 2 08:28:28 2012 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Nov 2 08:28:28 2012 -0400 Merge topic 'fix-KWSys-SystemInformation' into next 3673b96 KWSys: Fix SystemInformation on FreeBSD 424fb95 Revert "KWSys: In SystemInformation use netdb.h only where available" http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3673b96507199da13b0726e57491b4ee46f86330 commit 3673b96507199da13b0726e57491b4ee46f86330 Author: Richard Wackerbarth <rich...@nfsnet.org> AuthorDate: Fri Nov 2 08:26:04 2012 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Fri Nov 2 08:26:04 2012 -0400 KWSys: Fix SystemInformation on FreeBSD Add missing includes for this platform. diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx index 7612138..83dedfd 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx @@ -74,6 +74,14 @@ typedef int siginfo_t; # include <errno.h> // extern int errno; #endif +#ifdef __FreeBSD__ +# include <sys/sysctl.h> +# include <fenv.h> +# include <sys/socket.h> +# include <netdb.h> +# include <netinet/in.h> +#endif + #ifdef __APPLE__ # include <sys/sysctl.h> # include <mach/vm_statistics.h> http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=424fb9589f408a06f499ed038043554f70666df2 commit 424fb9589f408a06f499ed038043554f70666df2 Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Nov 2 08:24:40 2012 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Fri Nov 2 08:24:40 2012 -0400 Revert "KWSys: In SystemInformation use netdb.h only where available" This reverts commit 7bc06080fff9e151a0bc09ac59ea5a5f7a4bb2f1. diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt index bc133fd..777d76f 100644 --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/CMakeLists.txt @@ -582,11 +582,6 @@ IF(KWSYS_USE_SystemInformation) SET_PROPERTY(SOURCE SystemInformation.cxx APPEND PROPERTY COMPILE_DEFINITIONS KWSYS_SYS_HAS_IFADDRS_H=1) ENDIF() - CHECK_INCLUDE_FILES("sys/types.h;netdb.h" KWSYS_SYS_HAS_NETDB_H) - IF(KWSYS_SYS_HAS_NETDB_H) - SET_PROPERTY(SOURCE SystemInformation.cxx APPEND PROPERTY - COMPILE_DEFINITIONS KWSYS_SYS_HAS_NETDB_H=1) - ENDIF() ENDIF() IF(WIN32) INCLUDE(CheckSymbolExists) diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx index c5b6655..7612138 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx @@ -82,6 +82,7 @@ typedef int siginfo_t; # include <mach/mach_types.h> # include <fenv.h> # include <sys/socket.h> +# include <netdb.h> # include <netinet/in.h> # if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__-0 >= 1050 # include <execinfo.h> @@ -92,6 +93,7 @@ typedef int siginfo_t; #ifdef __linux # include <fenv.h> # include <sys/socket.h> +# include <netdb.h> # include <netinet/in.h> # if defined(__GNUG__) # include <execinfo.h> @@ -114,9 +116,6 @@ typedef struct rlimit ResourceLimitType; #if defined(KWSYS_SYS_HAS_IFADDRS_H) # include <ifaddrs.h> #endif -#if defined(KWSYS_SYS_HAS_NETDB_H) -# include <netdb.h> -#endif #ifdef __HAIKU__ # include <OS.h> @@ -1274,7 +1273,7 @@ int SystemInformationImplementation::GetFullyQualifiedDomainName( WSACleanup(); return 0; -#elif defined(KWSYS_SYS_HAS_IFADDRS_H) && defined(KWSYS_SYS_HAS_NETDB_H) +#elif defined(KWSYS_SYS_HAS_IFADDRS_H) // gethostname typical returns an alias for loopback interface // we want the fully qualified domain name. Because there are // any number of interfaces on this system we look for the ----------------------------------------------------------------------- Summary of changes: Source/kwsys/CMakeLists.txt | 5 ----- Source/kwsys/SystemInformation.cxx | 15 +++++++++++---- 2 files changed, 11 insertions(+), 9 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits