diff options
| author | Brad King <brad.king@kitware.com> | 2018-03-20 13:20:22 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-03-20 13:21:49 (GMT) |
| commit | 3b99c9689aae478708c83cafa552c4ce7bbf4a1b (patch) | |
| tree | 32ed19a93066560d2b97cc8da436ed05a30a383d /Modules | |
| parent | 157ae9a0889a3d46347bf8d241f074c7b25df988 (diff) | |
| parent | 73738f620f82ef0dc761559ec2b1ff25c9b21710 (diff) | |
| download | CMake-3b99c9689aae478708c83cafa552c4ce7bbf4a1b.zip CMake-3b99c9689aae478708c83cafa552c4ce7bbf4a1b.tar.gz CMake-3b99c9689aae478708c83cafa552c4ce7bbf4a1b.tar.bz2 | |
Merge topic 'FindwxWidgets-msvc-v141'
73738f620f FindwxWidgets: Add support for MSVC versions of the v141 toolset
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1861
Diffstat (limited to 'Modules')
| -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) |