[Cmake-commits] CMake branch, next, updated. v3.0.1-5022-g2b8b3d2

[hobbes1069 at gmail.com]

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  2b8b3d214f0c75560486db150c367683bf23975e (commit)
       via  33286235048495ceafb636d549d9a4e8891967ae (commit)
      from  4105529cbaaff25399714dab2e458d8e32b73a34 (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=2b8b3d214f0c75560486db150c367683bf23975e
commit 2b8b3d214f0c75560486db150c367683bf23975e
Merge: 4105529 3328623
Author:     CMake Topic Stage <kwrobot at kitware.com>
AuthorDate: Fri Aug 22 13:27:53 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 22 13:27:53 2014 -0400

    Merge topic 'wxWidgets-paths' into next
    
    33286235 FindwxWidgets: Improve path detection logic when cross-compiling.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33286235048495ceafb636d549d9a4e8891967ae
commit 33286235048495ceafb636d549d9a4e8891967ae
Author:     Richard M. Shaw <hobbes1069 at gmail.com>
AuthorDate: Fri Aug 22 11:35:00 2014 -0500
Commit:     Richard M. Shaw <hobbes1069 at gmail.com>
CommitDate: Fri Aug 22 12:20:42 2014 -0500

    FindwxWidgets: Improve path detection logic when cross-compiling.

diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index 45596a0..7ef06a8 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -229,13 +229,12 @@ else()
 endif()
 
 #=====================================================================
+# Determine whether unix or win32 paths should be used
 #=====================================================================
-if(WIN32 AND NOT CYGWIN AND NOT MSYS)
+if(WIN32 AND NOT CYGWIN AND NOT MSYS AND NOT CMAKE_CROSSCOMPILING)
   set(wxWidgets_FIND_STYLE "win32")
 else()
-  if(UNIX OR MSYS)
-    set(wxWidgets_FIND_STYLE "unix")
-  endif()
+  set(wxWidgets_FIND_STYLE "unix")
 endif()
 
 #=====================================================================

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

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


hooks/post-receive
-- 
CMake