From 4ef8a205edf66b652418aa5491436d26fd806175 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 24 Aug 2016 23:09:26 +0200
Subject: FindwxWidgets: Add version 3.1.0

Patch-by: Hannes Grobler (Johnny_xy on gitlab.kitware.com)
---
 Modules/FindwxWidgets.cmake | 1 +
 1 file changed, 1 insertion(+)

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
-- 
cgit v0.12


From 20d7da5276704864569fb08259278a08c5f9e725 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 24 Aug 2016 23:09:26 +0200
Subject: 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).

Patch-by: Hannes Grobler (Johnny_xy on gitlab.kitware.com)
---
 Modules/FindwxWidgets.cmake | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

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
-- 
cgit v0.12