From 73f7d266825f1d301aece1286666beda9297382b Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 22 Mar 2017 11:05:46 -0400 Subject: FindwxWidgets: Use `MSVC_VERSION` instead of `MSVC##` --- Modules/FindwxWidgets.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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) -- cgit v0.12 From 8f207df14de3b8141c37b8b34baae29ebda248b3 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 22 Mar 2017 11:07:16 -0400 Subject: FindwxWidgets: Add support for VS 2017 v141 toolset Issue: #16735 --- Modules/FindwxWidgets.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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) -- cgit v0.12