diff options
| author | Brad King <brad.king@kitware.com> | 2022-08-02 13:29:56 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-08-02 13:30:03 (GMT) |
| commit | e18fb0c73edf2c392ab6f86b4bdeebc28a7ec80d (patch) | |
| tree | 1d79d31c212fa6cf340cb358fc09177d53a6a899 /Source | |
| parent | 40b45f55f43715874ded8a2f021c65e168762be4 (diff) | |
| parent | c165dd6a8338eeb4273eaf0d76cb094a3f8f837b (diff) | |
| download | CMake-e18fb0c73edf2c392ab6f86b4bdeebc28a7ec80d.zip CMake-e18fb0c73edf2c392ab6f86b4bdeebc28a7ec80d.tar.gz CMake-e18fb0c73edf2c392ab6f86b4bdeebc28a7ec80d.tar.bz2 | |
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
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalVisualStudioVersionedGenerator.cxx | 2 |
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() |