mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-04 05:10:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'FindwxWidgets-vs-2017'

Browse Source 
8f207df1 FindwxWidgets: Add support for VS 2017 v141 toolset
73f7d266 FindwxWidgets: Use `MSVC_VERSION` instead of `MSVC##`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !608
This commit is contained in:
Brad King
2017-03-23 12:44:02 +00:00
committed by Kitware Robot
parent 922b7770bd 8f207df14d
commit e978a2e5b1
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/FindwxWidgets.cmake
+7 -5
View File
@@ -498,15 +498,17 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
set(_WX_TOOL gcc)
elseif(MSVC)
set(_WX_TOOL vc)
if(MSVC14)
if(MSVC_VERSION EQUAL 1910)
set(_WX_TOOLVER 141)
elseif(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)