[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1296-g00ffa50

[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  00ffa50f96700f65281241480f9c8149bb0776b5 (commit)
       via  ed6ddb89bf84e7835f65b33572981551db667c74 (commit)
       via  12faf00d71e9a9d9f48ee13ef9dd0011fa95c385 (commit)
      from  9a5ffc4da617b21187747db9a583caa4f000e574 (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=00ffa50f96700f65281241480f9c8149bb0776b5
commit 00ffa50f96700f65281241480f9c8149bb0776b5
Merge: 9a5ffc4 ed6ddb8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 20 09:44:44 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 20 09:44:44 2014 -0400

    Merge topic 'update-kwsys' into next
    
    ed6ddb89 Merge branch 'upstream-kwsys' into update-kwsys
    12faf00d KWSys 2014-03-19 (a8aa1014)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed6ddb89bf84e7835f65b33572981551db667c74
commit ed6ddb89bf84e7835f65b33572981551db667c74
Merge: 0f79dab 12faf00
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 20 09:42:27 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 20 09:42:27 2014 -0400

    Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12faf00d71e9a9d9f48ee13ef9dd0011fa95c385
commit 12faf00d71e9a9d9f48ee13ef9dd0011fa95c385
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Wed Mar 19 15:21:09 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 20 09:42:18 2014 -0400

    KWSys 2014-03-19 (a8aa1014)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ a8aa1014 | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' dd873734..a8aa1014
    Gerhard Grimm (1):
          fa86f1ba SystemInformation: Fix HP-UX PA-RISC processor detection
    
    Rolf Eike Beer (1):
          a8aa1014 SystemInformation: Fix HP-UX Intel processor detection
    
    Change-Id: I5891a6898cc73caf1b2be98859d5d4b11a24c5df

diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index 9c26380..720a7c3 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -5023,21 +5023,26 @@ bool SystemInformationImplementation::QueryHPUXProcessor()
     case CPU_PA_RISC1_0:
       this->ChipID.Vendor = "Hewlett-Packard";
       this->ChipID.Family = 0x100;
+      break;
     case CPU_PA_RISC1_1:
       this->ChipID.Vendor = "Hewlett-Packard";
       this->ChipID.Family = 0x110;
+      break;
     case CPU_PA_RISC2_0:
       this->ChipID.Vendor = "Hewlett-Packard";
       this->ChipID.Family = 0x200;
-#  ifdef CPU_HP_INTEL_EM_1_0
+      break;
+#  if defined(CPU_HP_INTEL_EM_1_0) || defined(CPU_IA64_ARCHREV_0)
+#   ifdef CPU_HP_INTEL_EM_1_0
     case CPU_HP_INTEL_EM_1_0:
-#  endif
-#  ifdef CPU_IA64_ARCHREV_0
+#   endif
+#   ifdef CPU_IA64_ARCHREV_0
     case CPU_IA64_ARCHREV_0:
-#  endif
+#   endif
       this->ChipID.Vendor = "GenuineIntel";
       this->Features.HasIA64 = true;
       break;
+#  endif
     default:
       return false;
     }

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

Summary of changes:
 Source/kwsys/SystemInformation.cxx |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake