From 3297e5c739001a7d931ebb88a36ebb6f0c524352 Mon Sep 17 00:00:00 2001
From: Bruno Postle <bruno@postle.net>
Date: Sat, 23 Mar 2019 11:59:18 +0000
Subject: [PATCH] cmake 3.14 fix (updated)

---
 wx_use_libs.patch | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/wx_use_libs.patch b/wx_use_libs.patch
index 4d0c5b3..073ec61 100644
--- a/wx_use_libs.patch
+++ b/wx_use_libs.patch
@@ -1,18 +1,13 @@
-diff -r 05a55c15585c -r 2a4ddd1a0fed CMakeLists.txt
---- a/CMakeLists.txt	Sat Mar 23 10:11:35 2019 +0100
-+++ b/CMakeLists.txt	Sat Mar 23 08:20:27 2019 +0100
-@@ -159,12 +159,11 @@
+diff -r 5abfb4de7961 CMakeLists.txt
+--- a/CMakeLists.txt	Sun Jan 21 12:56:33 2018 +0100
++++ b/CMakeLists.txt	Sat Mar 23 11:56:35 2019 +0000
+@@ -162,8 +162,7 @@
+ ##
  #  This must come before FINDs for tiff, jpeg, png, zlib to enable
  #  finding the wxWidgets distributions of those packages (Win32 only).
- IF(WIN32)
--  SET(wxWidgets_USE_LIBS base core aui xrc html xml adv gl qa)
-+  FIND_PACKAGE(wxWidgets REQUIRED base core aui xrc html xml adv gl qa)
- ELSE()
- # Unix needs also wxWidgets net library
--  SET(wxWidgets_USE_LIBS base core aui xrc html xml adv gl net qa)
-+  FIND_PACKAGE(wxWidgets REQUIRED base core aui xrc html xml adv gl net qa)
- ENDIF()
+-SET(wxWidgets_USE_LIBS base core aui xrc html xml adv gl net qa)
 -FIND_PACKAGE(wxWidgets REQUIRED)
++FIND_PACKAGE(wxWidgets REQUIRED base core aui xrc html xml adv gl net qa)
  
  # hugin requires wxwidgets 3.0 or above
  IF (UNIX)