diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-26 17:24:30 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-03-26 17:24:30 (GMT) |
| commit | 5ae8f33617227a70fe3ce34014a15f60b3f1904f (patch) | |
| tree | fdb7a269af99e9dafd17a63db98005b795505f78 | |
| parent | 046c1a1f655797a27e107aa828c1e044e263fcc5 (diff) | |
| parent | ed6ddb89bf84e7835f65b33572981551db667c74 (diff) | |
| download | CMake-5ae8f33617227a70fe3ce34014a15f60b3f1904f.zip CMake-5ae8f33617227a70fe3ce34014a15f60b3f1904f.tar.gz CMake-5ae8f33617227a70fe3ce34014a15f60b3f1904f.tar.bz2 | |
Merge topic 'update-kwsys'
ed6ddb89 Merge branch 'upstream-kwsys' into update-kwsys
12faf00d KWSys 2014-03-19 (a8aa1014)
| -rw-r--r-- | Source/kwsys/SystemInformation.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx index 9c26380..720a7c3 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/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; } |