[Cmake-commits] CMake branch, next, updated. v2.8.2-592-g846c1ec

[Miguel A. Figueroa-Villanueva]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  846c1ecad32f96dd76dd3eafc6946b4ce3137624 (commit)
       via  6bbf2a0e8e983b193e48ad1b227c46cf6ea9a85b (commit)
       via  fd141a0b70e39c09fdd136aa1d9030e782c50e58 (commit)
      from  e6381e8a68fe70d71e5f581e4a1a8fcf37190246 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=846c1ecad32f96dd76dd3eafc6946b4ce3137624
commit 846c1ecad32f96dd76dd3eafc6946b4ce3137624
Merge: e6381e8 6bbf2a0
Author:     Miguel A. Figueroa-Villanueva <miguelf at ieee.org>
AuthorDate: Sun Aug 29 12:50:10 2010 -0400
Commit:     Miguel A. Figueroa-Villanueva <miguelf at ieee.org>
CommitDate: Sun Aug 29 12:50:10 2010 -0400

    Merge topic FindwxWidgets-fixed-bug-9775 into next.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6bbf2a0e8e983b193e48ad1b227c46cf6ea9a85b
commit 6bbf2a0e8e983b193e48ad1b227c46cf6ea9a85b
Author:     Miguel A. Figueroa-Villanueva <miguelf at ieee.org>
AuthorDate: Sun Aug 29 12:22:18 2010 -0400
Commit:     Miguel A. Figueroa-Villanueva <miguelf at ieee.org>
CommitDate: Sun Aug 29 12:22:18 2010 -0400

    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.

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}

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindwxWidgets.cmake       |    5 +++--
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake