[Cmake-commits] CMake branch, next, updated. v3.6.1-1439-g826dd1e

[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  826dd1ed9908ac29fb375b7af232e7a13eaa647a (commit)
       via  b290832699d3baefa7588fc25fd03513d2af82bc (commit)
       via  430090e0a6c186291491cdece2bb2e349343a331 (commit)
      from  61a017f8810c9478009fe9e24e2968798bd13b59 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=826dd1ed9908ac29fb375b7af232e7a13eaa647a
commit 826dd1ed9908ac29fb375b7af232e7a13eaa647a
Merge: 61a017f b290832
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 25 10:08:00 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 25 10:08:00 2016 -0400

    Merge topic 'FindwxWidgets-library-path' into next
    
    b2908326 FindwxWidgets: Add VS-versioned library directory prefixes
    430090e0 FindwxWidgets: Add version 3.1.0


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b290832699d3baefa7588fc25fd03513d2af82bc
commit b290832699d3baefa7588fc25fd03513d2af82bc
Author:     Hannes Grobler <30o_24ff4snfv2oz at byom.de>
AuthorDate: Wed Aug 24 23:09:26 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 25 10:05:47 2016 -0400

    FindwxWidgets: Add VS-versioned library directory prefixes
    
    Add Visual Studio version number (supported: VS2008 to VS2015) to
    WX_LIB_DIR_PREFIX (old: vc / vc_x64; new: vc120 / vc120_x64).

diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index 30b8e21..47a70f5 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -504,10 +504,22 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
     # settings.
     if(MINGW)
       set(WX_LIB_DIR_PREFIX gcc)
-    elseif(CMAKE_CL_64)
-      set(WX_LIB_DIR_PREFIX vc_x64)
-    else()
+    elseif(MSVC)
       set(WX_LIB_DIR_PREFIX vc)
+      if(MSVC14)
+        set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}140)
+      elseif(MSVC12)
+        set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}120)
+      elseif(MSVC11)
+        set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}110)
+      elseif(MSVC10)
+        set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}100)
+      elseif(MSVC90)
+        set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}90)
+      endif()
+      if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+        set(WX_LIB_DIR_PREFIX ${WX_LIB_DIR_PREFIX}_x64)
+      endif()
     endif()
     if(BUILD_SHARED_LIBS)
       find_path(wxWidgets_LIB_DIR

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=430090e0a6c186291491cdece2bb2e349343a331
commit 430090e0a6c186291491cdece2bb2e349343a331
Author:     Hannes Grobler <30o_24ff4snfv2oz at byom.de>
AuthorDate: Wed Aug 24 23:09:26 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 25 10:04:42 2016 -0400

    FindwxWidgets: Add version 3.1.0

diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index 2974b9e..30b8e21 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -452,6 +452,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
       D:/
       ENV ProgramFiles
     PATH_SUFFIXES
+      wxWidgets-3.1.0
       wxWidgets-3.0.2
       wxWidgets-3.0.1
       wxWidgets-3.0.0

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

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


hooks/post-receive
-- 
CMake