[Cmake-commits] CMake branch, next, updated. v3.2.2-2301-g6c7244b

[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  6c7244ba1a93f03f14302925c98785619813cb57 (commit)
       via  1b04561edbe28f920561ca08855c8595b463d24b (commit)
      from  4fdef672f87ec5ca581adc5c39a0fe8f2f8b5760 (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=6c7244ba1a93f03f14302925c98785619813cb57
commit 6c7244ba1a93f03f14302925c98785619813cb57
Merge: 4fdef67 1b04561
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 29 12:51:50 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 29 12:51:50 2015 -0400

    Merge topic 'FindwxWidgets-versioned-executable' into next
    
    1b04561e FindwxWidgets: Search for wx-config-3.0 in addition to wx-config (#15540)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b04561edbe28f920561ca08855c8595b463d24b
commit 1b04561edbe28f920561ca08855c8595b463d24b
Author:     Orion Poplawski <orion at cora.nwra.com>
AuthorDate: Wed Apr 29 12:50:35 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 29 12:51:07 2015 -0400

    FindwxWidgets: Search for wx-config-3.0 in addition to wx-config (#15540)
    
    The Fedora package installs 'wx-config' as 'wx-config-3.0' so look
    for the latter name too.

diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index dec0ddf..c16c011 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -740,7 +740,7 @@ else()
     # UNIX: Start actual work.
     #-----------------------------------------------------------------
     # Support cross-compiling, only search in the target platform.
-    find_program(wxWidgets_CONFIG_EXECUTABLE wx-config
+    find_program(wxWidgets_CONFIG_EXECUTABLE wx-config wx-config-3.0
       DOC "Location of wxWidgets library configuration provider binary (wx-config)."
       ONLY_CMAKE_FIND_ROOT_PATH
       )

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

Summary of changes:
 Modules/FindwxWidgets.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake