mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 08:20:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

FindwxWidgets: Add support for MSVC versions of the v141 toolset

Browse Source 
Since commit v3.8.0-rc3~7^2 (FindwxWidgets: Add support for VS 2017 v141
toolset, 2017-03-22) more MSVC updates have been released that use a
MSVC_VERSION value higher than 1910.  Revise our checks accordingly.

Issue: #16735
This commit is contained in:
Adam Oleksy
2018-03-16 05:29:35 -04:00
committed by Brad King
parent 43e8e0b688
commit 73738f620f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/FindwxWidgets.cmake
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)