diff options
| author | Adam Oleksy <adam.oleksy+github@gmail.com> | 2018-03-16 09:29:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-03-19 15:56:00 (GMT) |
| commit | 73738f620f82ef0dc761559ec2b1ff25c9b21710 (patch) | |
| tree | ce9cd9303e9c390cdef1b68d3c603da385c36c23 | |
| parent | 43e8e0b6884ddcf3f55826c2247af268698f23a6 (diff) | |
| download | CMake-73738f620f82ef0dc761559ec2b1ff25c9b21710.zip CMake-73738f620f82ef0dc761559ec2b1ff25c9b21710.tar.gz CMake-73738f620f82ef0dc761559ec2b1ff25c9b21710.tar.bz2 | |
FindwxWidgets: Add support for MSVC versions of the v141 toolset
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
| -rw-r--r-- | Modules/FindwxWidgets.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index 965948e..202d481 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -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) |