From c12a723d4136ddbdebfe66219489b58b03f8062f Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Thu, 7 Jul 2022 07:44:38 -0400 Subject: [PATCH] Add 3.2 as search candidates for wxwidgets --- CMakeModules/FindwxWidgets.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeModules/FindwxWidgets.cmake b/CMakeModules/FindwxWidgets.cmake index f9c7a752ef..1cf5a4be53 100644 --- a/CMakeModules/FindwxWidgets.cmake +++ b/CMakeModules/FindwxWidgets.cmake @@ -293,6 +293,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") # Find wxWidgets multilib base libraries. find_library(WX_base${_DBG} NAMES + wxbase32${_UCD}${_DBG} wxbase31${_UCD}${_DBG} wxbase30${_UCD}${_DBG} wxbase29${_UCD}${_DBG} @@ -307,6 +308,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") foreach(LIB net odbc xml) find_library(WX_${LIB}${_DBG} NAMES + wxbase32${_UCD}${_DBG}_${LIB} wxbase31${_UCD}${_DBG}_${LIB} wxbase30${_UCD}${_DBG}_${LIB} wxbase29${_UCD}${_DBG}_${LIB} @@ -323,6 +325,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") # Find wxWidgets monolithic library. find_library(WX_mono${_DBG} NAMES + wx${_PF}${_UNV}32${_UCD}${_DBG} wx${_PF}${_UNV}31${_UCD}${_DBG} wx${_PF}${_UNV}30${_UCD}${_DBG} wx${_PF}${_UNV}29${_UCD}${_DBG} @@ -340,6 +343,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") stc ribbon propgrid webview) find_library(WX_${LIB}${_DBG} NAMES + wx${_PF}${_UNV}32${_UCD}${_DBG}_${LIB} wx${_PF}${_UNV}31${_UCD}${_DBG}_${LIB} wx${_PF}${_UNV}30${_UCD}${_DBG}_${LIB} wx${_PF}${_UNV}29${_UCD}${_DBG}_${LIB}