Skip to content

FindwxWidgets: Restore win32 find style on MinGW

Maarten requested to merge MaartenBent/cmake:findwxwidgets-mingw-regression into master

Since !7162 (merged), we only tried unix find style on MinGW. However, only some MinGW builds have the wx-config needed for unix find style. Other builds, including those using the official wxWidgets makefiles, do not provide wx-config and need to use win32 find style. To accommodate both use cases, first use win32 find style and if it fails, use unix find style.

In the second commit I added a small optimization so a user can provide wxWidgets_LIB_DIR and wxWidgets_ROOT_DIR at the same time in cmake-gui without wxWidgets_LIB_DIR being reset.

Backport: release

Edited by Brad King

Merge request reports