[Cmake-commits] CMake branch, next, updated. v3.8.0-rc2-573-g377cd08

[Kitware Robot]

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  377cd0876d8101934496d83ab86c06cd6b2ba246 (commit)
       via  8f207df14de3b8141c37b8b34baae29ebda248b3 (commit)
       via  73f7d266825f1d301aece1286666beda9297382b (commit)
      from  872531753f5216d1b6d9682923473df33f3b8860 (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=377cd0876d8101934496d83ab86c06cd6b2ba246
commit 377cd0876d8101934496d83ab86c06cd6b2ba246
Merge: 8725317 8f207df
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 22 15:09:28 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Mar 22 11:09:32 2017 -0400

    Stage topic 'FindwxWidgets-vs-2017'
    
    Topic-id: 23178
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/608


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f207df14de3b8141c37b8b34baae29ebda248b3
commit 8f207df14de3b8141c37b8b34baae29ebda248b3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 22 11:07:16 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 22 11:08:05 2017 -0400

    FindwxWidgets: Add support for VS 2017 v141 toolset
    
    Issue: #16735

diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index f1627b6..d30d35f 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -498,7 +498,9 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
       set(_WX_TOOL gcc)
     elseif(MSVC)
       set(_WX_TOOL vc)
-      if(MSVC_VERSION EQUAL 1900)
+      if(MSVC_VERSION EQUAL 1910)
+        set(_WX_TOOLVER 141)
+      elseif(MSVC_VERSION EQUAL 1900)
         set(_WX_TOOLVER 140)
       elseif(MSVC_VERSION EQUAL 1800)
         set(_WX_TOOLVER 120)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73f7d266825f1d301aece1286666beda9297382b
commit 73f7d266825f1d301aece1286666beda9297382b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 22 11:05:46 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 22 11:08:05 2017 -0400

    FindwxWidgets: Use `MSVC_VERSION` instead of `MSVC##`

diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index 77091f4..f1627b6 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -498,15 +498,15 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
       set(_WX_TOOL gcc)
     elseif(MSVC)
       set(_WX_TOOL vc)
-      if(MSVC14)
+      if(MSVC_VERSION EQUAL 1900)
         set(_WX_TOOLVER 140)
-      elseif(MSVC12)
+      elseif(MSVC_VERSION EQUAL 1800)
         set(_WX_TOOLVER 120)
-      elseif(MSVC11)
+      elseif(MSVC_VERSION EQUAL 1700)
         set(_WX_TOOLVER 110)
-      elseif(MSVC10)
+      elseif(MSVC_VERSION EQUAL 1600)
         set(_WX_TOOLVER 100)
-      elseif(MSVC90)
+      elseif(MSVC_VERSION EQUAL 1500)
         set(_WX_TOOLVER 90)
       endif()
       if(CMAKE_SIZEOF_VOID_P EQUAL 8)

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindwxWidgets.cmake |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake