summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiguel A. Figueroa-Villanueva <miguelf@ieee.org>2007-10-17 13:38:30 (GMT)
committerMiguel A. Figueroa-Villanueva <miguelf@ieee.org>2007-10-17 13:38:30 (GMT)
commit97e5b7e01fede19bd3910b1c1d3bdcc4ff3dbc02 (patch)
treea1732d7fe204f65fb81a5aa2f8168ace4b211a91
parent15ff54bc8bda804b13d38eb59403524cdbee82a9 (diff)
downloadCMake-97e5b7e01fede19bd3910b1c1d3bdcc4ff3dbc02.zip
CMake-97e5b7e01fede19bd3910b1c1d3bdcc4ff3dbc02.tar.gz
CMake-97e5b7e01fede19bd3910b1c1d3bdcc4ff3dbc02.tar.bz2
ENH: Added support for finding wxWidgets-2.9. Thanks to Joshua Jensen and Steven.
-rw-r--r--Modules/FindwxWidgets.cmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index e5153b7..0c7162a 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -213,6 +213,7 @@ IF(WIN32_STYLE_FIND)
# Find wxWidgets multilib base libraries
FIND_LIBRARY(WX_base${_DBG}
NAMES
+ wxbase29${_UCD}${_DBG}
wxbase28${_UCD}${_DBG}
wxbase27${_UCD}${_DBG}
wxbase26${_UCD}${_DBG}
@@ -224,6 +225,7 @@ IF(WIN32_STYLE_FIND)
FOREACH(LIB net odbc xml)
FIND_LIBRARY(WX_${LIB}${_DBG}
NAMES
+ wxbase29${_UCD}${_DBG}_${LIB}
wxbase28${_UCD}${_DBG}_${LIB}
wxbase27${_UCD}${_DBG}_${LIB}
wxbase26${_UCD}${_DBG}_${LIB}
@@ -237,6 +239,7 @@ IF(WIN32_STYLE_FIND)
# Find wxWidgets monolithic library
FIND_LIBRARY(WX_mono${_DBG}
NAMES
+ wxmsw${_UNV}29${_UCD}${_DBG}
wxmsw${_UNV}28${_UCD}${_DBG}
wxmsw${_UNV}27${_UCD}${_DBG}
wxmsw${_UNV}26${_UCD}${_DBG}
@@ -250,6 +253,7 @@ IF(WIN32_STYLE_FIND)
FOREACH(LIB core adv aui html media xrc dbgrid gl qa)
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}