diff options
| author | Brad King <brad.king@kitware.com> | 2014-09-26 13:34:26 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-09-26 13:34:26 (GMT) |
| commit | 208530090dd2707d39f2264b3a7dfe2c0428b583 (patch) | |
| tree | ea9eb190258a4f2311796b0f1639731755ab1ff6 /Source/kwsys/SystemTools.cxx | |
| parent | 4551a53c119b71473feaa9342d891c098819e8aa (diff) | |
| parent | a79ff0e4ed526f8ac0bb8f00201abf3d145fd7dd (diff) | |
| download | CMake-208530090dd2707d39f2264b3a7dfe2c0428b583.zip CMake-208530090dd2707d39f2264b3a7dfe2c0428b583.tar.gz CMake-208530090dd2707d39f2264b3a7dfe2c0428b583.tar.bz2 | |
Merge branch 'upstream-kwsys' into update-kwsys
Diffstat (limited to 'Source/kwsys/SystemTools.cxx')
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 8a61267..b1221e3 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/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) { |