diff options
| author | Brad King <brad.king@kitware.com> | 2024-05-07 12:30:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-05-07 12:31:17 (GMT) |
| commit | f082c3d4c3a5ef4252b00c1d9bcb6796fd9f9e4d (patch) | |
| tree | bdb3667619a9b2365ecd58bb2cf482f45045a556 | |
| parent | 50d7ab777c0f2c3fbdf8749471e106183d252288 (diff) | |
| parent | 8d29d3c79b351c8aa612a5d0b70b70b7b01e65b0 (diff) | |
| download | CMake-f082c3d4c3a5ef4252b00c1d9bcb6796fd9f9e4d.zip CMake-f082c3d4c3a5ef4252b00c1d9bcb6796fd9f9e4d.tar.gz CMake-f082c3d4c3a5ef4252b00c1d9bcb6796fd9f9e4d.tar.bz2 | |
Merge topic 'update-kwsys'
8d29d3c79b Merge branch 'upstream-KWSys' into update-kwsys
31a1906652 KWSys 2024-05-06 (307037cf)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9493
| -rw-r--r-- | Source/kwsys/SystemInformation.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx index 5e07e80..428d649 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx @@ -4646,7 +4646,7 @@ bool SystemInformationImplementation::ParseSysCtl() err = sysctlbyname("hw.machine", &tempBuff, &len, nullptr, 0); if (err == 0) { std::string machineBuf(tempBuff); - if (machineBuf.find_first_of("Power") != std::string::npos) { + if (machineBuf.find("Power") != std::string::npos) { this->ChipID.Vendor = "IBM"; err = kw_sysctlbyname_int32("hw.cputype", &tempInt32); @@ -4660,10 +4660,15 @@ bool SystemInformationImplementation::ParseSysCtl() } this->FindManufacturer(); - } else if (machineBuf.find_first_of("arm64") != std::string::npos) { + } else if (machineBuf.find("arm64") != std::string::npos) { this->ChipID.Vendor = "Apple"; this->FindManufacturer(); + + err = kw_sysctlbyname_int32("hw.optional.floatingpoint", &tempInt32); + if (err == 0) { + this->Features.HasFPU = static_cast<bool>(tempInt32); + } } } } else { |