diff options
| author | Brad King <brad.king@kitware.com> | 2024-05-06 13:27:52 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-05-06 13:27:52 (GMT) |
| commit | 8d29d3c79b351c8aa612a5d0b70b70b7b01e65b0 (patch) | |
| tree | 45cae401b308a5a60904dfc8485fd37ddd6f6d7c | |
| parent | 99a308dc0b1891aba87276a919833ed057f75ced (diff) | |
| parent | 31a19066520dde51c271a6a0b4c43932ae1a7857 (diff) | |
| download | CMake-8d29d3c79b351c8aa612a5d0b70b70b7b01e65b0.zip CMake-8d29d3c79b351c8aa612a5d0b70b70b7b01e65b0.tar.gz CMake-8d29d3c79b351c8aa612a5d0b70b70b7b01e65b0.tar.bz2 | |
Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
KWSys 2024-05-06 (307037cf)
| -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 { |