Merge topic 'FindwxWidgets-msvc-v141'

73738f620f FindwxWidgets: Add support for MSVC versions of the v141 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1861
This commit is contained in:
Brad King
2018-03-20 13:20:22 +00:00
committed by Kitware Robot

View File

@@ -498,17 +498,17 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
set(_WX_TOOL gcc)
elseif(MSVC)
set(_WX_TOOL vc)
if(MSVC_VERSION EQUAL 1910)
if(NOT MSVC_VERSION LESS 1910)
set(_WX_TOOLVER 141)
elseif(MSVC_VERSION EQUAL 1900)
elseif(NOT MSVC_VERSION LESS 1900)
set(_WX_TOOLVER 140)
elseif(MSVC_VERSION EQUAL 1800)
elseif(NOT MSVC_VERSION LESS 1800)
set(_WX_TOOLVER 120)
elseif(MSVC_VERSION EQUAL 1700)
elseif(NOT MSVC_VERSION LESS 1700)
set(_WX_TOOLVER 110)
elseif(MSVC_VERSION EQUAL 1600)
elseif(NOT MSVC_VERSION LESS 1600)
set(_WX_TOOLVER 100)
elseif(MSVC_VERSION EQUAL 1500)
elseif(NOT MSVC_VERSION LESS 1500)
set(_WX_TOOLVER 90)
endif()
if(CMAKE_SIZEOF_VOID_P EQUAL 8)