summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-08-02 13:29:56 +0000
committerKitware Robot <kwrobot@kitware.com>2022-08-02 09:30:03 -0400
commite18fb0c73edf2c392ab6f86b4bdeebc28a7ec80d (patch)
tree1d79d31c212fa6cf340cb358fc09177d53a6a899
parent40b45f55f43715874ded8a2f021c65e168762be4 (diff)
parentc165dd6a8338eeb4273eaf0d76cb094a3f8f837b (diff)
downloadcmake-e18fb0c73edf2c392ab6f86b4bdeebc28a7ec80d.tar.gz
Merge topic 'vs-msbuild-arm64' into release-3.24
c165dd6a83 VS: Fix ARM64 host architecture detection in x86 binary Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7525
-rw-r--r--Source/cmGlobalVisualStudioVersionedGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.cxx b/Source/cmGlobalVisualStudioVersionedGenerator.cxx
index 7eca96399c..7e36881935 100644
--- a/Source/cmGlobalVisualStudioVersionedGenerator.cxx
+++ b/Source/cmGlobalVisualStudioVersionedGenerator.cxx
@@ -67,7 +67,7 @@ static bool VSHasDotNETFrameworkArm64()
std::string dotNetArm64;
return cmSystemTools::ReadRegistryValue(
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\.NETFramework;InstallRootArm64",
- dotNetArm64);
+ dotNetArm64, cmSystemTools::KeyWOW64_64);
}
static bool VSIsWindows11OrGreater()