summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorMiguel A. Figueroa-Villanueva <miguelf@ieee.org>2010-08-29 16:22:18 (GMT)
committerMiguel A. Figueroa-Villanueva <miguelf@ieee.org>2010-08-29 16:22:18 (GMT)
commit6bbf2a0e8e983b193e48ad1b227c46cf6ea9a85b (patch)
treeacb49d74037ef40e34d8bb7c4a17ae13a00ca184 /Modules
parentfd141a0b70e39c09fdd136aa1d9030e782c50e58 (diff)
downloadCMake-6bbf2a0e8e983b193e48ad1b227c46cf6ea9a85b.zip
CMake-6bbf2a0e8e983b193e48ad1b227c46cf6ea9a85b.tar.gz
CMake-6bbf2a0e8e983b193e48ad1b227c46cf6ea9a85b.tar.bz2
ENH: #9775 Added support for new wxWidgets 2.9 libraries.
Added support for new libraries in wxWidgets 2.9 that are part of the main distribution. These are: wxPropertyGrid, wxSTC, wxScintilla, and wxRibbon.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindwxWidgets.cmake5
1 files changed, 3 insertions, 2 deletions
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index 687ae7c..b7af94a 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -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}