Skip to content

FindwxWidgets: Add support for 3.1.3 VS binaries

slodki requested to merge slodki/cmake:fix-wxwin-313 into master

wxWidgets 3.1.2 distributes separate \lib\vc140_x64_dll\ and \lib\vc141_x64_dll\ binary versions of the library.

The latest wxWidgets 3.1.3 distributes only single \lib\vc14x_x64_dll\ version.

CMake uses MSVC_TOOLSET_VERSION to find library files but it's not working any more with 3.1.3 wxWidgets version.

This simple patch adds vc14x to searched paths after more specific vc141 version is not found.

Results from patched module:

-- Found wxWidgets: debug;C:/wxWidgets-3.1.3-Release/lib/vc14x_x64_dll/wxmsw31ud_core.lib;optimized;C:/wxWidgets-3.1.3-Release
/lib/vc14x_x64_dll/wxmsw31u_core.lib;debug;C:/wxWidgets-3.1.3-Release/lib/vc14x_x64_dll/wxmsw31ud_qa.lib;optimized;C:/wxWidgets-3.1.3-
Release/lib/vc14x_x64_dll/wxmsw31u_qa.lib;debug;C:/wxWidgets-3.1.3-Release/lib/vc14x_x64_dll/wxmsw31ud_html.lib;optimized;C:/wxWidgets-
3.1.3-Release/lib/vc14x_x64_dll/wxmsw31u_html.lib;debug;C:/wxWidgets-3.1.3-Release/lib/vc14x_x64_dll/wxbase31ud_xml.lib;optimized;C:
/wxWidgets-3.1.3-Release/lib/vc14x_x64_dll/wxbase31u_xml.lib;debug;C:/wxWidgets-3.1.3-Release/lib/vc14x_x64_dll
/wxmsw31ud_aui.lib;optimized;C:/wxWidgets-3.1.3-Release/lib/vc14x_x64_dll/wxmsw31u_aui.lib;debug;C:/wxWidgets-3.1.3-Release
/lib/vc14x_x64_dll/wxmsw31ud_adv.lib;optimized;C:/wxWidgets-3.1.3-Release/lib/vc14x_x64_dll/wxmsw31u_adv.lib;debug;C:/wxWidgets-3.1.3-
Release/lib/vc14x_x64_dll/wxmsw31ud_stc.lib;optimized;C:/wxWidgets-3.1.3-Release/lib/vc14x_x64_dll/wxmsw31u_stc.lib;debug;C:/wxWidgets-
3.1.3-Release/lib/vc14x_x64_dll/wxmsw31ud_webview.lib;optimized;C:/wxWidgets-3.1.3-Release/lib/vc14x_x64_dll/wxmsw31u_webview.lib;debug;C:
/wxWidgets-3.1.3-Release/lib/vc14x_x64_dll/wxbase31ud.lib;optimized;C:/wxWidgets-3.1.3-Release/lib/vc14x_x64_dll/wxbase31u.lib;debug;C:
/wxWidgets-3.1.3-Release/lib/vc14x_x64_dll/wxscintillad.lib;optimized;C:/wxWidgets-3.1.3-Release/lib/vc14x_x64_dll/wxscintilla.lib;debug;C:
/wxWidgets-3.1.3-Release/lib/vc14x_x64_dll/wxpngd.lib;optimized;C:/wxWidgets-3.1.3-Release/lib/vc14x_x64_dll/wxpng.lib;debug;C:/wxWidgets-
3.1.3-Release/lib/vc14x_x64_dll/wxtiffd.lib;optimized;C:/wxWidgets-3.1.3-Release/lib/vc14x_x64_dll/wxtiff.lib;debug;C:/wxWidgets-3.1.3-
Release/lib/vc14x_x64_dll/wxjpegd.lib;optimized;C:/wxWidgets-3.1.3-Release/lib/vc14x_x64_dll/wxjpeg.lib;debug;C:/wxWidgets-3.1.3-Release
/lib/vc14x_x64_dll/wxzlibd.lib;optimized;C:/wxWidgets-3.1.3-Release/lib/vc14x_x64_dll/wxzlib.lib;debug;C:/wxWidgets-3.1.3-Release
/lib/vc14x_x64_dll/wxregexud.lib;optimized;C:/wxWidgets-3.1.3-Release/lib/vc14x_x64_dll/wxregexu.lib;debug;C:/wxWidgets-3.1.3-Release
/lib/vc14x_x64_dll/wxexpatd.lib;optimized;C:/wxWidgets-3.1.3-Release/lib/vc14x_x64_dll
/wxexpat.lib;winmm;comctl32;oleacc;rpcrt4;shlwapi;version;wsock32 (found suitable version "3.1.3", minimum required is "2.9.2") found
 components:  core qa html xml aui adv stc webview base scintilla png tiff jpeg zlib regex expat

Topic-rename: FindwxWidgets-wxwin-313

Edited by Brad King

Merge request reports