diff --git a/Help/manual/cmake-instrumentation.7.rst b/Help/manual/cmake-instrumentation.7.rst index 5e34262337..bf177bb0e4 100644 --- a/Help/manual/cmake-instrumentation.7.rst +++ b/Help/manual/cmake-instrumentation.7.rst @@ -520,6 +520,7 @@ generated whenever `Indexing`_ occurs and deleted after any user-specified * ``hostname`` * ``is64Bits`` * ``modelId`` + * ``modelName`` * ``numberOfLogicalCPU`` * ``numberOfPhysicalCPU`` * ``processorAPICID`` diff --git a/Source/cmInstrumentation.cxx b/Source/cmInstrumentation.cxx index d19dae0bf9..fa0d9bcff9 100644 --- a/Source/cmInstrumentation.cxx +++ b/Source/cmInstrumentation.cxx @@ -475,6 +475,7 @@ void cmInstrumentation::InsertStaticSystemInformation(Json::Value& root) infoRoot["hostname"] = info.GetHostname(); infoRoot["is64Bits"] = info.Is64Bits(); infoRoot["modelId"] = info.GetModelID(); + infoRoot["modelName"] = info.GetModelName(); infoRoot["numberOfLogicalCPU"] = info.GetNumberOfLogicalCPU(); infoRoot["numberOfPhysicalCPU"] = info.GetNumberOfPhysicalCPU(); infoRoot["OSName"] = info.GetOSName(); diff --git a/Tests/RunCMake/Instrumentation/hook.cmake b/Tests/RunCMake/Instrumentation/hook.cmake index 47ee35158c..cc04a1407e 100644 --- a/Tests/RunCMake/Instrumentation/hook.cmake +++ b/Tests/RunCMake/Instrumentation/hook.cmake @@ -98,6 +98,7 @@ if (NOT hasStaticInfo STREQUAL UNEXPECTED) json_has_key("${index}" "${staticSystemInformation}" hostname ${hasStaticInfo}) json_has_key("${index}" "${staticSystemInformation}" is64Bits ${hasStaticInfo}) json_has_key("${index}" "${staticSystemInformation}" modelId ${hasStaticInfo}) + json_has_key("${index}" "${staticSystemInformation}" modelName ${hasStaticInfo}) json_has_key("${index}" "${staticSystemInformation}" numberOfLogicalCPU ${hasStaticInfo}) json_has_key("${index}" "${staticSystemInformation}" numberOfPhysicalCPU ${hasStaticInfo}) json_has_key("${index}" "${staticSystemInformation}" processorAPICID ${hasStaticInfo}) @@ -122,6 +123,7 @@ if (NOT hasStaticInfo STREQUAL UNEXPECTED) familyId hostname modelId + modelName vendorID vendorString )