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, next has been updated
via 2a9b8c6cf786ec1eb0fbfa3be87223b7ec59f1dc (commit)
via f057d0f906bbf98891c02e403f4c0cf41f3cf8a8 (commit)
from 81fd86fa1998a107ab1de090b91c396c1f9e79a5 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a9b8c6cf786ec1eb0fbfa3be87223b7ec59f1dc
commit 2a9b8c6cf786ec1eb0fbfa3be87223b7ec59f1dc
Merge: 81fd86f f057d0f
Author: Brad King <[email protected]>
AuthorDate: Fri Jul 31 09:11:56 2015 -0400
Commit: CMake Topic Stage <[email protected]>
CommitDate: Fri Jul 31 09:11:56 2015 -0400
Merge topic 'fix-windows-version-detection' into next
f057d0f9 fixup! Windows: Fix CMAKE_HOST_SYSTEM_VERSION on newer versions
(#15674)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f057d0f906bbf98891c02e403f4c0cf41f3cf8a8
commit f057d0f906bbf98891c02e403f4c0cf41f3cf8a8
Author: Brad King <[email protected]>
AuthorDate: Fri Jul 31 09:10:58 2015 -0400
Commit: Brad King <[email protected]>
CommitDate: Fri Jul 31 09:10:58 2015 -0400
fixup! Windows: Fix CMAKE_HOST_SYSTEM_VERSION on newer versions (#15674)
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index c260c2f..1c8d5ea 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -457,7 +457,7 @@
cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
typedef LONG (FAR WINAPI *cmRtlGetVersion)(CMRTL_OSVERSIONINFOEXW*);
cmRtlGetVersion rtlGetVersion = reinterpret_cast<cmRtlGetVersion>(
- GetProcAddress(GetModuleHandle(L"ntdll.dll"), "RtlGetVersion"));
+ GetProcAddress(GetModuleHandleW(L"ntdll.dll"), "RtlGetVersion"));
if (rtlGetVersion && rtlGetVersion(&osviex) == 0)
{
std::ostringstream windowsVersionString;
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalGenerator.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/mailman/listinfo/cmake-commits
