mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-09 23:30:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

FindwxWidgets: Improve linking with scintilla

Browse Source 
Treat scintilla like any other common lib. Only add it when the stc
component is specified. Add imm32 to the list of required libraries
when stc is used.

Fixes: #23519
This commit is contained in:
Maarten Bent
2023-10-08 18:26:08 +02:00
committed by Brad King
parent c5e3d12213
commit 55072adf16
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/FindwxWidgets.cmake
View File

@@ -37,7 +37,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).
jpeg zlib regex expat scintilla).
@@ -286,8 +286,10 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
# Add the common (usually required libs) unless
# wxWidgets_EXCLUDE_COMMON_LIBRARIES has been set.
if(NOT wxWidgets_EXCLUDE_COMMON_LIBRARIES)
list(APPEND wxWidgets_FIND_COMPONENTS
${wxWidgets_COMMON_LIBRARIES})
if(stc IN_LIST wxWidgets_FIND_COMPONENTS)
list(APPEND wxWidgets_FIND_COMPONENTS scintilla)
endif()
list(APPEND wxWidgets_FIND_COMPONENTS ${wxWidgets_COMMON_LIBRARIES})
endif()
#-------------------------------------------------------------------
@@ -455,6 +457,10 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
list(APPEND wxWidgets_LIBRARIES opengl32 glu32)
endif()
if(stc IN_LIST ${_LIBS})
list(APPEND wxWidgets_LIBRARIES imm32)
endif()
list(APPEND wxWidgets_LIBRARIES winmm comctl32 uuid oleacc uxtheme rpcrt4 shlwapi version wsock32)
endmacro()