[Cmake-commits] CMake branch, next, updated. v3.0.2-5467-g20f7cfd
Brad King
brad.king at kitware.com
Fri Sep 26 09:34:57 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 20f7cfd1c2acd958c27b72c6a9ae614c9e51dcc2 (commit)
via 208530090dd2707d39f2264b3a7dfe2c0428b583 (commit)
via a79ff0e4ed526f8ac0bb8f00201abf3d145fd7dd (commit)
via 4551a53c119b71473feaa9342d891c098819e8aa (commit)
from 7dc3a625a0264949b24be8a81cc059e9a871f23d (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=20f7cfd1c2acd958c27b72c6a9ae614c9e51dcc2
commit 20f7cfd1c2acd958c27b72c6a9ae614c9e51dcc2
Merge: 7dc3a62 2085300
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 26 09:34:56 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 26 09:34:56 2014 -0400
Merge topic 'update-kwsys' into next
20853009 Merge branch 'upstream-kwsys' into update-kwsys
a79ff0e4 KWSys 2014-09-25 (29ffaf43)
4551a53c CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=208530090dd2707d39f2264b3a7dfe2c0428b583
commit 208530090dd2707d39f2264b3a7dfe2c0428b583
Merge: 4551a53 a79ff0e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 26 09:34:26 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 26 09:34:26 2014 -0400
Merge branch 'upstream-kwsys' into update-kwsys
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a79ff0e4ed526f8ac0bb8f00201abf3d145fd7dd
commit a79ff0e4ed526f8ac0bb8f00201abf3d145fd7dd
Author: KWSys Robot <kwrobot at kitware.com>
AuthorDate: Thu Sep 25 08:49:50 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 26 09:34:21 2014 -0400
KWSys 2014-09-25 (29ffaf43)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ 29ffaf43 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' fb77be5a..29ffaf43
Brad King (1):
29ffaf43 Suppress deprecation warnings for GetVersionEx
Sean McBride (1):
6aa1f800 SystemInformation: Fix clang -Wtautological-pointer-compare warning
Change-Id: I29f3dcf2a32e1b80bade233987eb091038aace65
diff --git a/ProcessWin32.c b/ProcessWin32.c
index c8ec754..ef71f26 100644
--- a/ProcessWin32.c
+++ b/ProcessWin32.c
@@ -36,6 +36,9 @@ a UNIX-style select system call.
#pragma warning (push, 1)
#endif
#include <windows.h> /* Windows API */
+#if defined(_MSC_VER) && _MSC_VER >= 1800
+# define KWSYS_WINDOWS_DEPRECATED_GetVersionEx
+#endif
#include <string.h> /* strlen, strdup */
#include <stdio.h> /* sprintf */
#include <io.h> /* _unlink */
@@ -335,7 +338,14 @@ kwsysProcess* kwsysProcess_New(void)
windows. */
ZeroMemory(&osv, sizeof(osv));
osv.dwOSVersionInfoSize = sizeof(osv);
+#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
+# pragma warning (push)
+# pragma warning (disable:4996)
+#endif
GetVersionEx(&osv);
+#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
+# pragma warning (pop)
+#endif
if(osv.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)
{
/* Win9x no longer supported. */
@@ -2370,7 +2380,14 @@ static kwsysProcess_List* kwsysProcess_List_New(void)
/* Select an implementation. */
ZeroMemory(&osv, sizeof(osv));
osv.dwOSVersionInfoSize = sizeof(osv);
+#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
+# pragma warning (push)
+# pragma warning (disable:4996)
+#endif
GetVersionEx(&osv);
+#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
+# pragma warning (pop)
+#endif
self->NT4 = (osv.dwPlatformId == VER_PLATFORM_WIN32_NT &&
osv.dwMajorVersion < 5)? 1:0;
diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index 2521aac..84b5f39 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -60,6 +60,9 @@
#if defined(_WIN32)
# include <windows.h>
+# if defined(_MSC_VER) && _MSC_VER >= 1800
+# define KWSYS_WINDOWS_DEPRECATED_GetVersionEx
+# endif
# include <errno.h>
# if defined(KWSYS_SYS_HAS_PSAPI)
# include <psapi.h>
@@ -3786,7 +3789,7 @@ bool SystemInformationImplementation::QueryLinuxMemory()
return false;
}
- if( unameInfo.release!=0 && strlen(unameInfo.release)>=3 )
+ if( strlen(unameInfo.release)>=3 )
{
// release looks like "2.6.3-15mdk-i686-up-4GB"
char majorChar=unameInfo.release[0];
@@ -5063,6 +5066,10 @@ bool SystemInformationImplementation::QueryOSInformation()
// Try calling GetVersionEx using the OSVERSIONINFOEX structure.
ZeroMemory (&osvi, sizeof (OSVERSIONINFOEXW));
osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEXW);
+#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
+# pragma warning (push)
+# pragma warning (disable:4996)
+#endif
bOsVersionInfoEx = GetVersionExW ((OSVERSIONINFOW*)&osvi);
if (!bOsVersionInfoEx)
{
@@ -5072,6 +5079,9 @@ bool SystemInformationImplementation::QueryOSInformation()
return false;
}
}
+#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
+# pragma warning (pop)
+#endif
switch (osvi.dwPlatformId)
{
diff --git a/SystemTools.cxx b/SystemTools.cxx
index 8a61267..b1221e3 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -82,6 +82,9 @@
# ifndef INVALID_FILE_ATTRIBUTES
# define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
# endif
+# if defined(_MSC_VER) && _MSC_VER >= 1800
+# define KWSYS_WINDOWS_DEPRECATED_GetVersionEx
+# endif
#elif defined (__CYGWIN__)
# include <windows.h>
# undef _WIN32
@@ -4629,6 +4632,10 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion()
ZeroMemory(&osvi, sizeof(OSVERSIONINFOEXA));
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA);
+#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
+# pragma warning (push)
+# pragma warning (disable:4996)
+#endif
bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO *)&osvi);
if (!bOsVersionInfoEx)
{
@@ -4638,6 +4645,9 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion()
return 0;
}
}
+#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
+# pragma warning (pop)
+#endif
switch (osvi.dwPlatformId)
{
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/kwsys/ProcessWin32.c | 17 +++++++++++++++++
Source/kwsys/SystemInformation.cxx | 12 +++++++++++-
Source/kwsys/SystemTools.cxx | 10 ++++++++++
4 files changed, 39 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list