Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 02:08:27 +08:00
Code Issues Projects Releases Wiki Activity

Merge topic 'update-kwsys'

Browse Source 
14891241ec Merge branch 'upstream-KWSys' into update-kwsys
9d2ef414ba KWSys 2025-07-07 (2f3a7814)
7c8e4687b9 ci: configure 'typos' to tolerate all 8-12 character hex identifiers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10920
This commit is contained in:
Brad King
2025-07-07 17:22:45 +00:00
committed by Kitware Robot
parent ada38fa12a 14891241ec
commit 5525104cd0
4 changed files with 104 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.typos.toml
View File

@@ -18,7 +18,7 @@ locale = "en-us"
# `extend-ignore-identifiers-re` to this section,
# please also modify the `.gitlab/ci/typos.bash`
# script accordingly.
#extend-ignore-identifiers-re=["\\b[0-9a-f]{10}\\b"]
#extend-ignore-identifiers-re=["\\b[0-9a-f]{8,12}\\b"]
# Add repo-wide false positives here in the form of `word = "word"`.
# Check the manual for details.

17
Source/kwsys/CMakeLists.txt
View File

@@ -911,12 +911,6 @@ endif()
# Setup testing if not being built as part of another project.
if(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
if(BUILD_TESTING)
# Compute the location of executables.
set(EXEC_DIR "${CMAKE_CURRENT_BINARY_DIR}")
if(CMAKE_RUNTIME_OUTPUT_DIRECTORY)
set(EXEC_DIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
endif()
# C tests
set(KWSYS_C_TESTS
testEncode.c
@@ -934,7 +928,7 @@ if(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
foreach(testfile IN LISTS KWSYS_C_TESTS)
get_filename_component(test "${testfile}" NAME_WE)
add_test(NAME kwsys.${test}
COMMAND ${EXEC_DIR}/${KWSYS_NAMESPACE}TestsC ${test} ${KWSYS_TEST_ARGS_${test}}
COMMAND ${KWSYS_NAMESPACE}TestsC ${test} ${KWSYS_TEST_ARGS_${test}}
)
set_property(TEST kwsys.${test} PROPERTY LABELS ${KWSYS_LABELS_TEST})
endforeach()
@@ -982,7 +976,10 @@ if(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
KWSYS_CXX_TEST_SRCS ${KWSYS_NAMESPACE}TestsCxx.cxx
${KWSYS_CXX_TESTS}
)
add_executable(${KWSYS_NAMESPACE}TestsCxx ${KWSYS_CXX_TEST_SRCS})
add_executable(${KWSYS_NAMESPACE}TestsCxx
${KWSYS_CXX_TEST_SRCS}
test.manifest
)
set_property(TARGET ${KWSYS_NAMESPACE}TestsCxx PROPERTY C_CLANG_TIDY "")
set_property(TARGET ${KWSYS_NAMESPACE}TestsCxx PROPERTY CXX_CLANG_TIDY "")
set_property(TARGET ${KWSYS_NAMESPACE}TestsCxx PROPERTY C_INCLUDE_WHAT_YOU_USE "")
@@ -1038,7 +1035,7 @@ if(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
foreach(testfile IN LISTS KWSYS_CXX_TESTS)
get_filename_component(test "${testfile}" NAME_WE)
add_test(NAME kwsys.${test}
COMMAND ${EXEC_DIR}/${KWSYS_NAMESPACE}TestsCxx ${test} ${KWSYS_TEST_ARGS_${test}}
COMMAND ${KWSYS_NAMESPACE}TestsCxx ${test} ${KWSYS_TEST_ARGS_${test}}
)
set_property(TEST kwsys.${test} PROPERTY LABELS ${KWSYS_LABELS_TEST})
endforeach()
@@ -1050,7 +1047,7 @@ if(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
#set(KWSYS_TEST_PROCESS_7 7) # uncomment to run timing-sensitive test locally
foreach(n IN ITEMS 1 2 3 4 5 6 ${KWSYS_TEST_PROCESS_7} 9 10)
add_test(NAME kwsys.testProcess-${n}
COMMAND ${EXEC_DIR}/${KWSYS_NAMESPACE}TestProcess ${n}
COMMAND ${KWSYS_NAMESPACE}TestProcess ${n}
)
set_property(TEST kwsys.testProcess-${n} PROPERTY LABELS ${KWSYS_LABELS_TEST})
set_property(TEST kwsys.testProcess-${n} PROPERTY TIMEOUT 120)

244
Source/kwsys/SystemInformation.cxx
View File

@@ -44,6 +44,7 @@
#include <fstream>
#include <iostream>
#include <limits>
#include <map>
#include <set>
#include <sstream>
#include <string>
@@ -5324,14 +5325,7 @@ bool SystemInformationImplementation::QueryOSInformation()
this->OSName = "Windows";
OSVERSIONINFOEXW osvi;
BOOL bIsWindows64Bit;
BOOL bOsVersionInfoEx;
char operatingSystem[256];
// Try calling GetVersionEx using the OSVERSIONINFOEX structure.
ZeroMemory(&osvi, sizeof(OSVERSIONINFOEXW));
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW);
OSVERSIONINFOEXW osvi = { sizeof(osvi) };
# ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
# pragma warning(push)
# ifdef __INTEL_COMPILER
@@ -5343,12 +5337,8 @@ bool SystemInformationImplementation::QueryOSInformation()
# pragma warning(disable : 4996)
# endif
# endif
bOsVersionInfoEx = GetVersionExW((OSVERSIONINFOW*)&osvi);
if (!bOsVersionInfoEx) {
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
if (!GetVersionExW((OSVERSIONINFOW*)&osvi)) {
return false;
}
if (!GetVersionExW((OSVERSIONINFOW*)&osvi)) {
return false;
}
# ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx
# ifdef __clang__
@@ -5358,167 +5348,91 @@ bool SystemInformationImplementation::QueryOSInformation()
# endif
# endif
switch (osvi.dwPlatformId) {
case VER_PLATFORM_WIN32_NT:
// Test for the product.
if (osvi.dwMajorVersion <= 4) {
this->OSRelease = "NT";
}
if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0) {
this->OSRelease = "2000";
}
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 (osvi.wProductType == VER_NT_WORKSTATION) {
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 {
if (osvi.wSuiteMask & VER_SUITE_PERSONAL) {
this->OSRelease += " Personal";
} else {
this->OSRelease += " Professional";
}
}
# endif
} else if (osvi.wProductType == VER_NT_SERVER) {
// Check for .NET Server instead of Windows XP.
if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1) {
this->OSRelease = ".NET";
}
// Produce the release like it is displayed in `cmd`
this->OSRelease = std::to_string(osvi.dwMajorVersion) + "." +
std::to_string(osvi.dwMinorVersion) + "." +
std::to_string(osvi.dwBuildNumber & 0xFFFF);
// Continue with the type detection.
if (osvi.wSuiteMask & VER_SUITE_DATACENTER) {
this->OSRelease += " DataCenter Server";
} else if (osvi.wSuiteMask & VER_SUITE_ENTERPRISE) {
this->OSRelease += " Advanced Server";
} else {
this->OSRelease += " Server";
}
}
struct VersionNames
{
char const* workstation;
char const* server;
};
snprintf(operatingSystem, sizeof(operatingSystem), "%ls (Build %ld)",
osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF);
this->OSVersion = operatingSystem;
} else
# endif // VER_NT_WORKSTATION
{
HKEY hKey;
wchar_t szProductType[80];
DWORD dwBufLen;
std::map<std::pair<DWORD, DWORD>, VersionNames> const products = {
// clang-format off
{ { 10, 0 }, { "10", "2016" } },
{ { 6, 3 }, { "8.1", "2012 R2" } },
{ { 6, 2 }, { "8", "2012" } },
{ { 6, 1 }, { "7", "2008 R2" } },
{ { 6, 0 }, { "Vista", "2008" } },
{ { 5, 2 }, { "XP", "2003" } },
{ { 5, 1 }, { "XP", ".NET" } },
{ { 5, 0 }, { "2000", "2000" } },
{ { 4, 90 }, { "Me", "" } },
{ { 4, 10 }, { "98", "" } },
{ { 4, 0 }, { "95", "NT 4.0" } },
{ { 3, 51 }, { "", "NT 3.51" } },
{ { 3, 10 }, { "3.1", "" } },
{ { 3, 0 }, { "3.0", "" } },
{ { 2, 0 }, { "2.0", "" } },
// clang-format on
};
// Query the registry to retrieve information.
RegOpenKeyExW(HKEY_LOCAL_MACHINE,
L"SYSTEM\\CurrentControlSet\\Control\\ProductOptions", 0,
KEY_QUERY_VALUE, &hKey);
RegQueryValueExW(hKey, L"ProductType", nullptr, nullptr,
(LPBYTE)szProductType, &dwBufLen);
RegCloseKey(hKey);
this->OSVersion = "Windows ";
if (osvi.wProductType == VER_NT_SERVER) {
this->OSVersion += "Server ";
}
if (lstrcmpiW(L"WINNT", szProductType) == 0) {
this->OSRelease += " Professional";
}
if (lstrcmpiW(L"LANMANNT", szProductType) == 0) {
// Decide between Windows 2000 Advanced Server and Windows .NET
// Enterprise Server.
if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1) {
this->OSRelease += " Standard Server";
} else {
this->OSRelease += " Server";
}
}
if (lstrcmpiW(L"SERVERNT", szProductType) == 0) {
// Decide between Windows 2000 Advanced Server and Windows .NET
// Enterprise Server.
if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1) {
this->OSRelease += " Enterprise Server";
} else {
this->OSRelease += " Advanced Server";
}
}
}
auto const it = products.find({ osvi.dwMajorVersion, osvi.dwMinorVersion });
if (it != products.end()) {
bool const useServer =
(osvi.dwPlatformId == VER_PLATFORM_WIN32_NT &&
(osvi.dwMajorVersion <= 4 || osvi.wProductType != VER_NT_WORKSTATION));
this->OSVersion += useServer ? it->second.server : it->second.workstation;
} else {
this->OSVersion += "Unknown Version";
}
// Display version, service pack (if any), and build number.
if (osvi.dwMajorVersion <= 4) {
// NB: NT 4.0 and earlier.
snprintf(operatingSystem, sizeof(operatingSystem),
"version %ld.%ld %ls (Build %ld)", osvi.dwMajorVersion,
osvi.dwMinorVersion, osvi.szCSDVersion,
osvi.dwBuildNumber & 0xFFFF);
this->OSVersion = operatingSystem;
} else if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1) {
// Windows XP and .NET server.
using LPFNPROC = BOOL(CALLBACK*)(HANDLE, BOOL*);
HINSTANCE hKernelDLL;
LPFNPROC DLLProc;
if (osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2) {
// special case for Windows XP x64
if (osvi.wProductType == VER_NT_WORKSTATION) {
this->OSVersion += " x64";
}
// Load the Kernel32 DLL.
hKernelDLL = LoadLibraryW(L"kernel32");
if (hKernelDLL != nullptr) {
// Only XP and .NET Server support IsWOW64Process so... Load
// dynamically!
DLLProc = (LPFNPROC)GetProcAddress(hKernelDLL, "IsWow64Process");
// special case for Windows Server 2003 R2
else if (GetSystemMetrics(SM_SERVERR2) != 0) {
this->OSVersion += " R2";
}
}
// If the function address is valid, call the function.
if (DLLProc != nullptr)
(DLLProc)(GetCurrentProcess(), &bIsWindows64Bit);
else
bIsWindows64Bit = false;
// special case for Windows 98 SE
else if (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 10) {
if (osvi.szCSDVersion[1] == 'A') {
this->OSVersion += " SE";
}
}
// Free the DLL module.
FreeLibrary(hKernelDLL);
}
} else {
// Windows 2000 and everything else.
snprintf(operatingSystem, sizeof(operatingSystem), "%ls (Build %ld)",
osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF);
this->OSVersion = operatingSystem;
}
break;
// special case for Windows 95 OSR 2
else if (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 0) {
if (osvi.szCSDVersion[1] == 'C') {
this->OSVersion += " OSR 2.5";
} else if (osvi.szCSDVersion[1] == 'B') {
this->OSVersion += " OSR 2";
}
}
case VER_PLATFORM_WIN32_WINDOWS:
// Test for the product.
if (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 0) {
this->OSRelease = "95";
if (osvi.szCSDVersion[1] == 'C') {
this->OSRelease += "OSR 2.5";
} else if (osvi.szCSDVersion[1] == 'B') {
this->OSRelease += "OSR 2";
}
}
if (osvi.wSuiteMask & VER_SUITE_DATACENTER) {
this->OSVersion += " DataCenter";
} else if (osvi.wSuiteMask & VER_SUITE_ENTERPRISE) {
this->OSVersion += " Enterprise";
}
if (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 10) {
this->OSRelease = "98";
if (osvi.szCSDVersion[1] == 'A') {
this->OSRelease += "SE";
}
}
if (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 90) {
this->OSRelease = "Me";
}
break;
case VER_PLATFORM_WIN32s:
this->OSRelease = "Win32s";
break;
default:
this->OSRelease = "Unknown";
break;
// append service pack (if any)
if (osvi.szCSDVersion[0] != 0 && osvi.szCSDVersion[0] != ' ') {
char buffer[256];
snprintf(buffer, sizeof(buffer), " %ls", osvi.szCSDVersion);
this->OSVersion += buffer;
}
// Get the hostname

17
Source/kwsys/test.manifest Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- Windows 10 and Windows 11 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
<!-- Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
<!-- Windows 8 -->
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
<!-- Windows 7 -->
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
<!-- Windows Vista -->
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />
</application>
</compatibility>
</assembly>