From 659cee669b1902975dec1998f66b40f74a4d01a2 Mon Sep 17 00:00:00 2001
From: Sebastien Barre <sebastien.barre@kitware.com>
Date: Wed, 15 Oct 2008 23:24:33 -0400
Subject: [PATCH] ENH: fix for Windows Vista
---
SystemTools.cxx | 29 ++++++++++++++++++++++-------
kwsysDateStamp.cmake | 2 +-
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/SystemTools.cxx b/SystemTools.cxx
index d1f9f9c..f3d7d40 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -4170,6 +4170,18 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion()
// Test for the specific product family.
+ if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 0)
+ {
+ if (osvi.wProductType == VER_NT_WORKSTATION)
+ {
+ res += "Microsoft Windows Vista";
+ }
+ else
+ {
+ res += "Microsoft Windows Server 2008 family";
+ }
+ }
+
if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2)
{
res += "Microsoft Windows Server 2003 family";
@@ -4203,13 +4215,16 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion()
{
res += " Workstation 4.0";
}
- else if (osvi.wSuiteMask & VER_SUITE_PERSONAL)
- {
- res += " Home Edition";
- }
- else
+ else if (osvi.dwMajorVersion == 5)
{
- res += " Professional";
+ if (osvi.wSuiteMask & VER_SUITE_PERSONAL)
+ {
+ res += " Home Edition";
+ }
+ else
+ {
+ res += " Professional";
+ }
}
}
@@ -4253,7 +4268,7 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion()
}
}
- else // Windows NT 4.0
+ else if (osvi.dwMajorVersion <= 4) // Windows NT 4.0
{
if (osvi.wSuiteMask & VER_SUITE_ENTERPRISE)
{
diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake
index 9555f58..a32a7d9 100644
--- a/kwsysDateStamp.cmake
+++ b/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2008)
SET(KWSYS_DATE_STAMP_MONTH 10)
# KWSys version date day component. Format is DD.
-SET(KWSYS_DATE_STAMP_DAY 10)
+SET(KWSYS_DATE_STAMP_DAY 15)
--
GitLab