This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via 3bc2fb55b46cb7daebe92bad3a5e6e9426af28b5 (commit)
via 5c26e3c5e39096d8d9d990a586f6368a33252055 (commit)
from 3411c815752470432d56c7bf265d9f99d174d082 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3bc2fb55b46cb7daebe92bad3a5e6e9426af28b5
commit 3bc2fb55b46cb7daebe92bad3a5e6e9426af28b5
Merge: 3411c81 5c26e3c
Author: Brad King <[email protected]>
AuthorDate: Fri Feb 15 12:28:58 2019 +0000
Commit: Kitware Robot <[email protected]>
CommitDate: Fri Feb 15 07:29:05 2019 -0500
Merge topic 'vs2017-sdk81'
5c26e3c5e3 VS: Fix validation of Windows 8.1 SDK
Acked-by: Kitware Robot <[email protected]>
Acked-by: Dedmen Miller <[email protected]>
Merge-request: !2962
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c26e3c5e39096d8d9d990a586f6368a33252055
commit 5c26e3c5e39096d8d9d990a586f6368a33252055
Author: Brad King <[email protected]>
AuthorDate: Thu Feb 14 07:39:06 2019 -0500
Commit: Brad King <[email protected]>
CommitDate: Thu Feb 14 08:25:26 2019 -0500
VS: Fix validation of Windows 8.1 SDK
The check added by commit 0a29a31161 (VS2017: Verify Windows 8.1 SDK
before using it, 2017-04-25, v3.8.1~2^2) used the wrong path to
`windows.h` within the SDK, leading to it never being detected.
Fixes: #18923
diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.cxx
b/Source/cmGlobalVisualStudioVersionedGenerator.cxx
index 12d9304..913fc4a 100644
--- a/Source/cmGlobalVisualStudioVersionedGenerator.cxx
+++ b/Source/cmGlobalVisualStudioVersionedGenerator.cxx
@@ -453,7 +453,8 @@ bool
cmGlobalVisualStudioVersionedGenerator::IsWin81SDKInstalled() const
"HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\"
"Windows Kits\\Installed Roots;KitsRoot81",
win81Root, cmSystemTools::KeyWOW64_32)) {
- return cmSystemTools::FileExists(win81Root + "/um/windows.h", true);
+ return cmSystemTools::FileExists(win81Root + "/include/um/windows.h",
+ true);
}
return false;
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalVisualStudioVersionedGenerator.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
https://cmake.org/mailman/listinfo/cmake-commits
