echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VS2017: Verify Windows 8.1 SDK before using it

Browse Source 
The detection logic added by commit v3.8.0-rc2~14^2 (VS2017: If Win 8.1
SDK is not available, use Win 10 SDK, 2017-02-20) was incomplete.  It is
possible for the Win 8.1 SDK registry entry to exist, and even the
directory, but the header files to not actually be installed.  Teach
`cmGlobalVisualStudio15Generator::IsWin81SDKInstalled` to verify that
the `windows.h` header actually exists in the SDK directory.  We do this
in `cmGlobalVisualStudio14Generator::GetWindows10SDKVersion` for the
Windows 10 SDK already.

Fixes: #16811
This commit is contained in:
Roger Leigh 2017-04-25 10:32:42 +01:00 committed by Brad King
parent a6a0cfb24d
commit 0a29a31161
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGlobalVisualStudio15Generator.cxx
View File

@ -164,7 +164,7 @@ bool cmGlobalVisualStudio15Generator::IsWin81SDKInstalled() const
"HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\"
"Windows Kits\\Installed Roots;KitsRoot81",
win81Root, cmSystemTools::KeyWOW64_32)) {
return true;
return cmSystemTools::FileExists(win81Root + "/um/windows.h", true);
}
return false;
}