[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-223-gfe8eb21

[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  fe8eb21f76a0a61ef19d48002958757ece0ce298 (commit)
       via  2c9697431528ce78aa3aab9c0e1849641d9f61ec (commit)
      from  572f5cd0f989be995ddffee88cad9fe465569cbb (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=fe8eb21f76a0a61ef19d48002958757ece0ce298
commit fe8eb21f76a0a61ef19d48002958757ece0ce298
Merge: 572f5cd 2c96974
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 8 09:15:44 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 8 09:15:44 2015 -0400

    Merge topic 'FindwxWidgets-versioned-executable' into next
    
    2c969743 FindwxWidgets: Fix find_program call for versioned names


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c9697431528ce78aa3aab9c0e1849641d9f61ec
commit 2c9697431528ce78aa3aab9c0e1849641d9f61ec
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 8 09:12:07 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 8 09:13:29 2015 -0400

    FindwxWidgets: Fix find_program call for versioned names
    
    In commit v3.3.0-rc1~132^2 (FindwxWidgets: Search for wx-config-3.0 in
    addition to wx-config, 2015-04-29) we added a second (versioned) name to
    the find_program call.  Specifying multiple names requires use of the
    NAMES option.  Add it now.  While at it, also add versioned names for
    2.9 and 2.8.

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

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

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


hooks/post-receive
-- 
CMake