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 81fd86fa1998a107ab1de090b91c396c1f9e79a5 (commit)
via bdf76620f8239763df27dce59f2695de6ac03392 (commit)
from 1549af20a9fbeac6535f6f7134afeb3a4849de74 (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=81fd86fa1998a107ab1de090b91c396c1f9e79a5
commit 81fd86fa1998a107ab1de090b91c396c1f9e79a5
Merge: 1549af2 bdf7662
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Jul 31 09:02:05 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Jul 31 09:02:05 2015 -0400
Merge topic 'fix-windows-version-detection' into next
bdf76620 fixup! Windows: Fix CMAKE_HOST_SYSTEM_VERSION on newer versions
(#15674)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bdf76620f8239763df27dce59f2695de6ac03392
commit bdf76620f8239763df27dce59f2695de6ac03392
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Jul 31 09:01:56 2015 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Jul 31 09:01:56 2015 -0400
fixup! Windows: Fix CMAKE_HOST_SYSTEM_VERSION on newer versions (#15674)
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index e171b0a..c260c2f 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -484,7 +484,8 @@
cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
# pragma warning (pop)
#endif
std::ostringstream windowsVersionString;
- windowsVersionString << osvi.dwMajorVersion << "." <<
osvi.dwMinorVersion;
+ windowsVersionString << osvi.dwMajorVersion << "."
+ << osvi.dwMinorVersion;
windowsVersionString.str();
mf->AddDefinition("CMAKE_HOST_SYSTEM_VERSION",
windowsVersionString.str().c_str());
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalGenerator.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
