diff options
| author | Brad King <brad.king@kitware.com> | 2010-11-09 15:41:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-11-09 15:50:03 (GMT) |
| commit | d8e0bfa7863f817cd226eca65626525f6b1d1f57 (patch) | |
| tree | e147bd000b36199e290b70a6daee7579431d8c90 /Source/kwsys/SystemInformation.cxx | |
| parent | bbb3d81d383737f4111f7303b36c23c537aaf17a (diff) | |
| download | CMake-d8e0bfa7863f817cd226eca65626525f6b1d1f57.zip CMake-d8e0bfa7863f817cd226eca65626525f6b1d1f57.tar.gz CMake-d8e0bfa7863f817cd226eca65626525f6b1d1f57.tar.bz2 | |
KWSys: Teach SystemInformation about WinXP Pro and Win7
Modify a few lines in the function QueryOSInformation.
Change-Id: Ief8327144fdf5588354d4ce8240eb0206722e77e
Author: Marius Staring <m.staring@lumc.nl>
Diffstat (limited to 'Source/kwsys/SystemInformation.cxx')
| -rw-r--r-- | Source/kwsys/SystemInformation.cxx | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx index 936c1f7..4818ce9 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx @@ -3304,28 +3304,37 @@ bool SystemInformationImplementation::QueryOSInformation() { case VER_PLATFORM_WIN32_NT: // Test for the product. - if (osvi.dwMajorVersion <= 4) + if (osvi.dwMajorVersion <= 4) { this->OSRelease = "NT"; } - if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0) + if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0) { this->OSRelease = "2000"; } - if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1) + if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1) + { + this->OSRelease = "XP"; + } + // XP Professional x64 + if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2) { this->OSRelease = "XP"; } #ifdef VER_NT_WORKSTATION // Test for product type. - if (bOsVersionInfoEx) + if (bOsVersionInfoEx) { - if (osvi.wProductType == VER_NT_WORKSTATION) + if (osvi.wProductType == VER_NT_WORKSTATION) { - if (osvi.dwMajorVersion == 6) + if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 0) { this->OSRelease = "Vista"; } + if (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 1) + { + this->OSRelease = "7"; + } // VER_SUITE_PERSONAL may not be defined #ifdef VER_SUITE_PERSONAL else |