--- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -293,6 +293,21 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32") ) MARK_AS_ADVANCED(WX_${LIB}${_DBG}) ENDFOREACH(LIB) + + # Find wxWidgets contrib libraries + FOREACH(LIB applet deprecated fl foldbar gizmos mmedia net ogl plot stc svg) + FIND_LIBRARY(WX_${LIB}${_DBG} + NAMES + wxmsw${_UNV}29${_UCD}${_DBG}_${LIB} + wxmsw${_UNV}28${_UCD}${_DBG}_${LIB} + wxmsw${_UNV}27${_UCD}${_DBG}_${LIB} + wxmsw${_UNV}26${_UCD}${_DBG}_${LIB} + wxmsw${_UNV}25${_UCD}${_DBG}_${LIB} + PATHS ${WX_LIB_DIR} + NO_DEFAULT_PATH + ) + MARK_AS_ADVANCED(WX_${LIB}${_DBG}) + ENDFOREACH(LIB) ENDMACRO(WX_FIND_LIBS) # @@ -555,6 +570,11 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32") SET(wxWidgets_FOUND FALSE) ENDIF(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h) + IF(EXISTS ${WX_ROOT_DIR}/contrib/include) + LIST(APPEND wxWidgets_INCLUDE_DIRS + ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}) + ENDIF(EXISTS ${WX_ROOT_DIR}/contrib/include) + # Find wxWidgets libraries. WX_FIND_LIBS("${UNV}" "${UCD}" "${DBG}") IF(WX_USE_REL_AND_DBG)