diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-23 12:44:02 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-03-23 12:44:05 (GMT) |
| commit | e978a2e5b135e25d6654570a6ed948bd5b0f33dc (patch) | |
| tree | 20e839d0e4045e493c9972c5f717ed8b464e9bb2 /Modules | |
| parent | 922b7770bda42a365b062f942b9fc08b2a443709 (diff) | |
| parent | 8f207df14de3b8141c37b8b34baae29ebda248b3 (diff) | |
| download | CMake-e978a2e5b135e25d6654570a6ed948bd5b0f33dc.zip CMake-e978a2e5b135e25d6654570a6ed948bd5b0f33dc.tar.gz CMake-e978a2e5b135e25d6654570a6ed948bd5b0f33dc.tar.bz2 | |
Merge topic 'FindwxWidgets-vs-2017'
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
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindwxWidgets.cmake | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index 77091f4..d30d35f 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -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) |