[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-507-g32931f6

[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  32931f681db4ac02b9a25656d2f4fe8d6e4f43c2 (commit)
       via  3a6c3599063dcaf1a19e7987d0486c5e8edf28a1 (commit)
       via  dd563e1eb3002578fcc28f9cc4ef9d2326043a23 (commit)
      from  a5ac2c8c66194e177ba45ed328c1fcc0fbbda143 (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=32931f681db4ac02b9a25656d2f4fe8d6e4f43c2
commit 32931f681db4ac02b9a25656d2f4fe8d6e4f43c2
Merge: a5ac2c8 3a6c359
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 11 08:56:48 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 11 08:56:48 2014 -0500

    Merge topic 'fix-vs12-GetVersionEx-warning' into next
    
    3a6c3599 Suppress deprecation warnings for GetVersionEx
    dd563e1e CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a6c3599063dcaf1a19e7987d0486c5e8edf28a1
commit 3a6c3599063dcaf1a19e7987d0486c5e8edf28a1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 11 08:55:58 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 11 08:55:58 2014 -0500

    Suppress deprecation warnings for GetVersionEx
    
    Visual Studio 12 (2013) deprecated GetVersionEx:
    
      warning C4996: 'GetVersionExW': was declared deprecated
    
    in favor of either "versionhelpers.h" or VerifyVersionInfo, neither of
    which exist in some of the older compilers we support.  Rather than
    try to port conditionally to VerifyVersionInfo, simply suppress the
    warning for now.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a729c3d..aec47fb 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -11,6 +11,9 @@
 ============================================================================*/
 #if defined(_WIN32) && !defined(__CYGWIN__)
 #include "windows.h" // this must be first to define GetCurrentDirectory
+#if defined(_MSC_VER) && _MSC_VER >= 1800
+# define KWSYS_WINDOWS_DEPRECATED_GetVersionEx
+#endif
 #endif
 
 #include "cmGlobalGenerator.h"
@@ -456,7 +459,14 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
     OSVERSIONINFO osvi;
     ZeroMemory(&osvi, sizeof(osvi));
     osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
+# pragma warning (push)
+# pragma warning (disable:4996)
+#endif
     GetVersionEx (&osvi);
+#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
+# pragma warning (pop)
+#endif
     cmOStringStream windowsVersionString;
     windowsVersionString << osvi.dwMajorVersion << "." << osvi.dwMinorVersion;
     windowsVersionString.str();

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

Summary of changes:
 Source/CMakeVersion.cmake    |    2 +-
 Source/cmGlobalGenerator.cxx |   10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake