[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5513-gdadc524

[Brad King]

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  dadc524debfc785f4ebc96ac9bee338fcaf6bbda (commit)
       via  2cd559789b1315d85ae1221941b5a4359e36d552 (commit)
      from  a5b7212ae40e1abe397a2e95a3f12b4a14410ea7 (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=dadc524debfc785f4ebc96ac9bee338fcaf6bbda
commit dadc524debfc785f4ebc96ac9bee338fcaf6bbda
Merge: a5b7212 2cd5597
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 20 11:02:09 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 20 11:02:09 2013 -0500

    Merge topic 'FindwxWidgets-3.0.0' into next
    
    2cd5597 FindwxWidgets: Add support for wxWidgets 3.0.0 (#14587)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2cd559789b1315d85ae1221941b5a4359e36d552
commit 2cd559789b1315d85ae1221941b5a4359e36d552
Author:     Arnaud Desmier <arnaud.desmier at free.fr>
AuthorDate: Wed Nov 20 16:43:24 2013 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Nov 20 10:51:55 2013 -0500

    FindwxWidgets: Add support for wxWidgets 3.0.0 (#14587)
    
    Add the "wxWidgets-3.0.0" path suffix and the "30" library names.
    While at it, add the "wxWidgets-2.9.5" suffix too.

diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index 4ecab62..3c664e7 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -303,6 +303,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
     # Find wxWidgets multilib base libraries.
     find_library(WX_base${_DBG}
       NAMES
+      wxbase30${_UCD}${_DBG}
       wxbase29${_UCD}${_DBG}
       wxbase28${_UCD}${_DBG}
       wxbase27${_UCD}${_DBG}
@@ -315,6 +316,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
     foreach(LIB net odbc xml)
       find_library(WX_${LIB}${_DBG}
         NAMES
+        wxbase30${_UCD}${_DBG}_${LIB}
         wxbase29${_UCD}${_DBG}_${LIB}
         wxbase28${_UCD}${_DBG}_${LIB}
         wxbase27${_UCD}${_DBG}_${LIB}
@@ -329,6 +331,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
     # Find wxWidgets monolithic library.
     find_library(WX_mono${_DBG}
       NAMES
+      wxmsw${_UNV}30${_UCD}${_DBG}
       wxmsw${_UNV}29${_UCD}${_DBG}
       wxmsw${_UNV}28${_UCD}${_DBG}
       wxmsw${_UNV}27${_UCD}${_DBG}
@@ -344,6 +347,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
                 stc ribbon propgrid webview)
       find_library(WX_${LIB}${_DBG}
         NAMES
+        wxmsw${_UNV}30${_UCD}${_DBG}_${LIB}
         wxmsw${_UNV}29${_UCD}${_DBG}_${LIB}
         wxmsw${_UNV}28${_UCD}${_DBG}_${LIB}
         wxmsw${_UNV}27${_UCD}${_DBG}_${LIB}
@@ -457,6 +461,8 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
       D:/
       ENV ProgramFiles
     PATH_SUFFIXES
+      wxWidgets-3.0.0
+      wxWidgets-2.9.5
       wxWidgets-2.9.4
       wxWidgets-2.9.3
       wxWidgets-2.9.2

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

Summary of changes:
 Modules/FindwxWidgets.cmake |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake