summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-08-02 13:29:56 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-08-02 13:30:04 (GMT)
commit5889e5c0ebd6eb7b18ea6a186decb8b53031d3e9 (patch)
treec9819a0db5a76bae586b018f0b88f87cf396be76
parent0357540e9d818bb7745a38ee40eac411b40bb9b4 (diff)
parentc165dd6a8338eeb4273eaf0d76cb094a3f8f837b (diff)
downloadCMake-5889e5c0ebd6eb7b18ea6a186decb8b53031d3e9.zip
CMake-5889e5c0ebd6eb7b18ea6a186decb8b53031d3e9.tar.gz
CMake-5889e5c0ebd6eb7b18ea6a186decb8b53031d3e9.tar.bz2
Merge topic 'vs-msbuild-arm64'
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 7eca963..7e36881 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()