[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-166-g4fbed29
Brad King
brad.king at kitware.com
Thu Oct 6 16:45:04 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 4fbed291a99c5e1fd1c51abbbfbe430ad716e091 (commit)
via ae975013067b228e3bb712c479ece54813c4a34f (commit)
from af6f3004dcf83123b3d12cf7446edb51bbec1b14 (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=4fbed291a99c5e1fd1c51abbbfbe430ad716e091
commit 4fbed291a99c5e1fd1c51abbbfbe430ad716e091
Merge: af6f300 ae97501
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 6 16:45:03 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 6 16:45:03 2016 -0400
Merge topic 'vs-15-preview-5' into next
ae975013 VS: Update VS 15 generator for Preview 5
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae975013067b228e3bb712c479ece54813c4a34f
commit ae975013067b228e3bb712c479ece54813c4a34f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 6 16:43:50 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 6 16:43:50 2016 -0400
VS: Update VS 15 generator for Preview 5
The `PlatformToolset` is now `v141` instead of `v140`.
Closes: #16347
diff --git a/Source/cmGlobalVisualStudio15Generator.cxx b/Source/cmGlobalVisualStudio15Generator.cxx
index 4d62f2b..a833a5f 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 = "v140";
+ this->DefaultPlatformToolset = "v141";
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