kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'revert-fix-windows-version-detection' 

4c7744c8 Revert "Windows: Fix CMAKE_HOST_SYSTEM_VERSION on Windows >= 8.1 (#15674)"
This commit is contained in:
Brad King 2015-09-11 11:04:01 -04:00 committed by CMake Topic Stage
parent 24b7e3f8fd 4c7744c891
commit 1181375381
1 changed files with 10 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Source/cmGlobalGenerator.cxx
View File

@ -14,20 +14,6 @@
#if defined(_MSC_VER) && _MSC_VER >= 1800 #if defined(_MSC_VER) && _MSC_VER >= 1800
# define KWSYS_WINDOWS_DEPRECATED_GetVersionEx # define KWSYS_WINDOWS_DEPRECATED_GetVersionEx
#endif #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 #endif
#include "cmGlobalGenerator.h" #include "cmGlobalGenerator.h"
@ -446,45 +432,23 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
if (!mf->GetDefinition("CMAKE_SYSTEM")) if (!mf->GetDefinition("CMAKE_SYSTEM"))
{ {
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32) && !defined(__CYGWIN__)
CMRTL_OSVERSIONINFOEXW osviex; /* Windows version number data. */
ZeroMemory(&osviex, sizeof(osviex)); OSVERSIONINFO osvi;
osviex.dwOSVersionInfoSize = sizeof(osviex); ZeroMemory(&osvi, sizeof(osvi));
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
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);
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx #ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
# pragma warning (push) # pragma warning (push)
# pragma warning (disable:4996) # pragma warning (disable:4996)
#endif #endif
GetVersionEx (&osvi); GetVersionEx (&osvi);
#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx #ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
# pragma warning (pop) # pragma warning (pop)
#endif #endif
std::ostringstream windowsVersionString; std::ostringstream windowsVersionString;
windowsVersionString << osvi.dwMajorVersion << "." windowsVersionString << osvi.dwMajorVersion << "." << osvi.dwMinorVersion;
<< osvi.dwMinorVersion; windowsVersionString.str();
windowsVersionString.str(); mf->AddDefinition("CMAKE_HOST_SYSTEM_VERSION",
mf->AddDefinition("CMAKE_HOST_SYSTEM_VERSION", windowsVersionString.str().c_str());
windowsVersionString.str().c_str());
}
#endif #endif
// Read the DetermineSystem file // Read the DetermineSystem file
std::string systemFile = mf->GetModulesFile("CMakeDetermineSystem.cmake"); std::string systemFile = mf->GetModulesFile("CMakeDetermineSystem.cmake");