diff options
| author | Brad King <brad.king@kitware.com> | 2017-04-26 13:03:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-04-26 13:03:15 (GMT) |
| commit | ffb77367b4645cc83de76fe0daf2745b5892a1b3 (patch) | |
| tree | 392577d13890464fe176388eccba5d75aca2e698 | |
| parent | 380232e10519d97a382bb50a048baa3044d3d170 (diff) | |
| parent | 0a29a311612eca698886d271e4137224a5a4d65a (diff) | |
| download | CMake-ffb77367b4645cc83de76fe0daf2745b5892a1b3.zip CMake-ffb77367b4645cc83de76fe0daf2745b5892a1b3.tar.gz CMake-ffb77367b4645cc83de76fe0daf2745b5892a1b3.tar.bz2 | |
Merge topic 'vs2017-sdk-detection'
0a29a311 VS2017: Verify Windows 8.1 SDK before using it
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !756
| -rw-r--r-- | Source/cmGlobalVisualStudio15Generator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalVisualStudio15Generator.cxx b/Source/cmGlobalVisualStudio15Generator.cxx index 2312bc0..da2bf8c 100644 --- a/Source/cmGlobalVisualStudio15Generator.cxx +++ b/Source/cmGlobalVisualStudio15Generator.cxx @@ -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; } |