[cmake-commits] miguelf committed FindwxWidgets.cmake 1.6 1.7

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv29872

Modified Files:
	FindwxWidgets.cmake 
Log Message:
ENH: Added support for finding wxWidgets-2.9. Thanks to Joshua Jensen and Steven.


Index: FindwxWidgets.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindwxWidgets.cmake,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- FindwxWidgets.cmake	13 Oct 2007 01:30:24 -0000	1.6
+++ FindwxWidgets.cmake	17 Oct 2007 13:38:30 -0000	1.7
@@ -213,6 +213,7 @@
     # 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 @@
     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 @@
     # 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 @@
     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}