[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-168-g650d0c6
Brad King
brad.king at kitware.com
Thu Oct 6 16:46:21 EDT 2016
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 650d0c63e50ff502e9f5fcbf08f885ebb32b6101 (commit)
via 2c93d6ca7f77e1f657c8df3019fd8a95f74db7a6 (commit)
from 4fbed291a99c5e1fd1c51abbbfbe430ad716e091 (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=650d0c63e50ff502e9f5fcbf08f885ebb32b6101
commit 650d0c63e50ff502e9f5fcbf08f885ebb32b6101
Merge: 4fbed29 2c93d6c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 6 16:46:20 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 6 16:46:20 2016 -0400
Merge topic 'vs-15-preview-5' into next
2c93d6ca Revert "VS: Update VS 15 generator for Preview 5"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c93d6ca7f77e1f657c8df3019fd8a95f74db7a6
commit 2c93d6ca7f77e1f657c8df3019fd8a95f74db7a6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 6 16:45:57 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 6 16:45:57 2016 -0400
Revert "VS: Update VS 15 generator for Preview 5"
This reverts commit ae975013067b228e3bb712c479ece54813c4a34f.
Doc updates are needed too.
diff --git a/Source/cmGlobalVisualStudio15Generator.cxx b/Source/cmGlobalVisualStudio15Generator.cxx
index a833a5f..4d62f2b 100644
--- a/Source/cmGlobalVisualStudio15Generator.cxx
+++ b/Source/cmGlobalVisualStudio15Generator.cxx
@@ -79,7 +79,7 @@ cmGlobalVisualStudio15Generator::cmGlobalVisualStudio15Generator(
"HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\15.0\\Setup\\VC;"
"ProductDir",
vc15Express, cmSystemTools::KeyWOW64_32);
- this->DefaultPlatformToolset = "v141";
+ this->DefaultPlatformToolset = "v140";
this->Version = VS15;
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalVisualStudio15Generator.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list