Merge topic 'FindwxWidgets-fixed-bug-9775'
f51eb9c BUG: #9775 Fixed patch FindwxWidgets-fixed-bug-9775. 6bbf2a0 ENH: #9775 Added support for new wxWidgets 2.9 libraries.
This commit is contained in:
commit
f628cac5b0
@ -252,7 +252,7 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
|
||||
# FIXME: What if both regex libs are available. regex should be
|
||||
# found outside the loop and only wx${LIB}${_UCD}${_DBG}.
|
||||
# Find wxWidgets common libraries.
|
||||
FOREACH(LIB ${wxWidgets_COMMON_LIBRARIES})
|
||||
FOREACH(LIB ${wxWidgets_COMMON_LIBRARIES} scintilla)
|
||||
FIND_LIBRARY(WX_${LIB}${_DBG}
|
||||
NAMES
|
||||
wx${LIB}${_UCD}${_DBG} # for regex
|
||||
@ -303,7 +303,8 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
|
||||
MARK_AS_ADVANCED(WX_mono${_DBG})
|
||||
|
||||
# Find wxWidgets multilib libraries.
|
||||
FOREACH(LIB core adv aui html media xrc dbgrid gl qa richtext)
|
||||
FOREACH(LIB core adv aui html media xrc dbgrid gl qa richtext
|
||||
stc ribbon propgrid)
|
||||
FIND_LIBRARY(WX_${LIB}${_DBG}
|
||||
NAMES
|
||||
wxmsw${_UNV}29${_UCD}${_DBG}_${LIB}
|
||||
@ -330,7 +331,7 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
|
||||
# Clear all debug or release library paths (arguments are "d" or "").
|
||||
MACRO(WX_CLEAR_ALL_LIBS _DBG)
|
||||
# Clear wxWidgets common libraries.
|
||||
FOREACH(LIB ${wxWidgets_COMMON_LIBRARIES})
|
||||
FOREACH(LIB ${wxWidgets_COMMON_LIBRARIES} scintilla)
|
||||
WX_CLEAR_LIB(WX_${LIB}${_DBG})
|
||||
ENDFOREACH(LIB)
|
||||
|
||||
@ -344,7 +345,8 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
|
||||
WX_CLEAR_LIB(WX_mono${_DBG})
|
||||
|
||||
# Clear wxWidgets multilib libraries.
|
||||
FOREACH(LIB core adv aui html media xrc dbgrid gl qa richtext)
|
||||
FOREACH(LIB core adv aui html media xrc dbgrid gl qa richtext
|
||||
stc ribbon propgrid)
|
||||
WX_CLEAR_LIB(WX_${LIB}${_DBG})
|
||||
ENDFOREACH(LIB)
|
||||
ENDMACRO(WX_CLEAR_ALL_LIBS)
|
||||
|
Loading…
x
Reference in New Issue
Block a user