diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-22 11:28:25 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-03-22 11:28:25 -0400 |
| commit | 4fbae41f889a53903fd5f625ee378b333e8a75fc (patch) | |
| tree | 0cbc90e7a55c970373b77627c5e40603090dc740 | |
| parent | 352b195f8769c5e4c884c1f9d0ba6d747d533547 (diff) | |
| parent | 8f207df14de3b8141c37b8b34baae29ebda248b3 (diff) | |
| download | cmake-4fbae41f889a53903fd5f625ee378b333e8a75fc.tar.gz | |
Merge branch 'FindwxWidgets-vs-2017' into release
| -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 77091f4326..d30d35fa7d 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) |