[Cmake-commits] CMake branch, next, updated. v3.3.1-2851-g54329e1

[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  54329e174573e7d6f5aa497074e4a37bd8167750 (commit)
       via  4c7744c891b878d9c8298f7e861e2475081abb06 (commit)
      from  92875bd700ec97b97a2b5ab8137e56a69d8774c2 (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=54329e174573e7d6f5aa497074e4a37bd8167750
commit 54329e174573e7d6f5aa497074e4a37bd8167750
Merge: 92875bd 4c7744c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 10 16:04:51 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 10 16:04:51 2015 -0400

    Merge topic 'revert-fix-windows-version-detection' into next
    
    4c7744c8 Revert "Windows: Fix CMAKE_HOST_SYSTEM_VERSION on Windows >= 8.1 (#15674)"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c7744c891b878d9c8298f7e861e2475081abb06
commit 4c7744c891b878d9c8298f7e861e2475081abb06
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 10 16:02:09 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 10 16:02:09 2015 -0400

    Revert "Windows: Fix CMAKE_HOST_SYSTEM_VERSION on Windows >= 8.1 (#15674)"
    
    This reverts commit d4736d53cd61f2cbbb36bec682663b74b01dddce.
    RtlGetVersion is a private API not meant for public use.  Another
    solution to detecting the Windows version will be needed.
    
    Reported-by: Gilles Khouzam <Gilles.Khouzam at microsoft.com>

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 1c8d5ea..cd05c54 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -14,20 +14,6 @@
 #if defined(_MSC_VER) && _MSC_VER >= 1800
 # define KWSYS_WINDOWS_DEPRECATED_GetVersionEx
 #endif
-typedef struct {
-  ULONG  dwOSVersionInfoSize;
-  ULONG  dwMajorVersion;
-  ULONG  dwMinorVersion;
-  ULONG  dwBuildNumber;
-  ULONG  dwPlatformId;
-  WCHAR  szCSDVersion[128];
-  USHORT wServicePackMajor;
-  USHORT wServicePackMinor;
-  USHORT wSuiteMask;
-  UCHAR  wProductType;
-  UCHAR  wReserved;
-} CMRTL_OSVERSIONINFOEXW;
-
 #endif
 
 #include "cmGlobalGenerator.h"
@@ -451,45 +437,23 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
   if (!mf->GetDefinition("CMAKE_SYSTEM"))
     {
 #if defined(_WIN32) && !defined(__CYGWIN__)
-    CMRTL_OSVERSIONINFOEXW osviex;
-    ZeroMemory(&osviex, sizeof(osviex));
-    osviex.dwOSVersionInfoSize = sizeof(osviex);
-
-    typedef LONG (FAR WINAPI *cmRtlGetVersion)(CMRTL_OSVERSIONINFOEXW*);
-    cmRtlGetVersion rtlGetVersion = reinterpret_cast<cmRtlGetVersion>(
-      GetProcAddress(GetModuleHandleW(L"ntdll.dll"), "RtlGetVersion"));
-    if (rtlGetVersion && rtlGetVersion(&osviex) == 0)
-      {
-      std::ostringstream windowsVersionString;
-      windowsVersionString << osviex.dwMajorVersion << "."
-                           << osviex.dwMinorVersion << "."
-                           << osviex.dwBuildNumber;
-      windowsVersionString.str();
-      mf->AddDefinition("CMAKE_HOST_SYSTEM_VERSION",
-                        windowsVersionString.str().c_str());
-      }
-    else
-      {
-      // RtlGetVersion failed, so use the deprecated GetVersionEx function.
-      /* Windows version number data.  */
-      OSVERSIONINFO osvi;
-      ZeroMemory(&osvi, sizeof(osvi));
-      osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+    /* Windows version number data.  */
+    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);
+    GetVersionEx (&osvi);
 #ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
 # pragma warning (pop)
 #endif
-      std::ostringstream windowsVersionString;
-      windowsVersionString << osvi.dwMajorVersion << "."
-                           << osvi.dwMinorVersion;
-      windowsVersionString.str();
-      mf->AddDefinition("CMAKE_HOST_SYSTEM_VERSION",
-                        windowsVersionString.str().c_str());
-      }
+    std::ostringstream windowsVersionString;
+    windowsVersionString << osvi.dwMajorVersion << "." << osvi.dwMinorVersion;
+    windowsVersionString.str();
+    mf->AddDefinition("CMAKE_HOST_SYSTEM_VERSION",
+                      windowsVersionString.str().c_str());
 #endif
     // Read the DetermineSystem file
     std::string systemFile = mf->GetModulesFile("CMakeDetermineSystem.cmake");

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

Summary of changes:
 Source/cmGlobalGenerator.cxx |   56 ++++++++----------------------------------
 1 file changed, 10 insertions(+), 46 deletions(-)


hooks/post-receive
-- 
CMake