[Cmake-commits] CMake branch, master, updated. v2.8.3-8-gd8e0bfa

[KWSys Robot]

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, master has been updated
       via  d8e0bfa7863f817cd226eca65626525f6b1d1f57 (commit)
      from  bbb3d81d383737f4111f7303b36c23c537aaf17a (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=d8e0bfa7863f817cd226eca65626525f6b1d1f57
commit d8e0bfa7863f817cd226eca65626525f6b1d1f57
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 9 10:41:45 2010 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 9 10:50:03 2010 -0500

    KWSys: Teach SystemInformation about WinXP Pro and Win7
    
    Modify a few lines in the function QueryOSInformation.
    
    Change-Id: Ief8327144fdf5588354d4ce8240eb0206722e77e
    Author: Marius Staring <m.staring at lumc.nl>

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

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

Summary of changes:
 Source/kwsys/SystemInformation.cxx |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake