Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 02:08:27 +08:00
Code Issues Projects Releases Wiki Activity

Merge topic 'findwxwidgets'

Browse Source 
96f6382357 FindwxWidgets: updates for wxWidgets 3.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vadim Zeitlin <vz-kitware@zeitlins.org>
Merge-request: !11190
This commit is contained in:
Brad King
2025-09-16 13:51:41 +00:00
committed by Kitware Robot
parent a66c325ec1 96f6382357
commit ae0f7f8498
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Modules/FindwxWidgets.cmake
View File

@@ -157,7 +157,7 @@ select a configuration):
``wxWidgets_EXCLUDE_COMMON_LIBRARIES``
Set to TRUE to exclude linking of commonly required libs (e.g., png, tiff,
jpeg, zlib, regex, expat, scintilla, lexilla, etc.).
jpeg, zlib, webp, regex, expat, scintilla, lexilla, etc.).
For Unix style this module uses the ``wx-config`` utility. Selecting
between debug/release, unicode/ansi, universal/non-universal, and
@@ -412,7 +412,8 @@ endif()
#=====================================================================
if(wxWidgets_FIND_STYLE STREQUAL "win32")
# Useful common wx libs needed by almost all components.
set(wxWidgets_COMMON_LIBRARIES png tiff jpeg zlib regex expat)
set(wxWidgets_WEBP_LIBRARIES webp webpdemux sharpyuv)
set(wxWidgets_COMMON_LIBRARIES png tiff jpeg zlib ${wxWidgets_WEBP_LIBRARIES} regex expat)
# Libraries needed by stc component
set(wxWidgets_STC_LIBRARIES scintilla lexilla)
@@ -607,7 +608,30 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
list(APPEND wxWidgets_LIBRARIES imm32)
endif()
list(APPEND wxWidgets_LIBRARIES gdiplus msimg32 winmm comctl32 uuid oleacc uxtheme rpcrt4 shlwapi version wsock32)
list(APPEND wxWidgets_LIBRARIES
kernel32
user32
gdi32
gdiplus
msimg32
comdlg32
winspool
winmm
shell32
shlwapi
comctl32
ole32
oleaut32
uuid
rpcrt4
advapi32
version
ws2_32
wininet
oleacc
uxtheme
wsock32
)
endmacro()
#-------------------------------------------------------------------