3 files changed, 32 insertions, 4 deletions
diff --git a/ports/wxwidgets/CONTROL b/ports/wxwidgets/CONTROL
index 357ab8f8b..7c3479f33 100644
--- a/ports/wxwidgets/CONTROL
+++ b/ports/wxwidgets/CONTROL
@@ -1,6 +1,7 @@
 Source: wxwidgets
 Version: 3.1.4
-Port-Version: 1
+Port-Version: 2
 Homepage: https://github.com/wxWidgets/wxWidgets
 Description: wxWidgets is a widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications.
-Build-Depends: zlib, libpng, tiff, expat
-\ No newline at end of file
+Build-Depends: zlib, libpng, tiff, expat
+Supports: !uwp
diff --git a/ports/wxwidgets/fix-expat.patch b/ports/wxwidgets/fix-expat.patch
new file mode 100644
index 000000000..2eebc42c9
--- /dev/null
+++ b/ports/wxwidgets/fix-expat.patch
@@ -0,0 +1,24 @@
+diff --git a/build/cmake/lib/expat.cmake b/build/cmake/lib/expat.cmake
+index 1d2b79b..04bef93 100644
+--- a/build/cmake/lib/expat.cmake
++++ b/build/cmake/lib/expat.cmake
+@@ -7,14 +7,9 @@
+ # Licence:     wxWindows licence
+ #############################################################################
+ 
+-if(wxUSE_EXPAT STREQUAL "builtin")
+-    wx_add_builtin_library(wxexpat
+-        src/expat/expat/lib/xmlparse.c
+-        src/expat/expat/lib/xmlrole.c
+-        src/expat/expat/lib/xmltok.c
+-    )
+-    set(EXPAT_LIBRARIES wxexpat)
+-    set(EXPAT_INCLUDE_DIRS ${wxSOURCE_DIR}/src/expat/expat/lib)
+-elseif(wxUSE_EXPAT)
+-    find_package(EXPAT REQUIRED)
++find_package(expat CONFIG REQUIRED)
++if(WIN32 AND NOT MINGW)
++    set(EXPAT_LIBRARIES expat::libexpat)
++else()
++    set(EXPAT_LIBRARIES expat::expat)
+ endif()
diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake
index c862fec38..3ae94b56d 100644
--- a/ports/wxwidgets/portfile.cmake
+++ b/ports/wxwidgets/portfile.cmake
@@ -1,3 +1,5 @@
+vcpkg_fail_port_install(ON_TARGET "uwp")
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO wxWidgets/wxWidgets
@@ -7,10 +9,11 @@ vcpkg_from_github(
     PATCHES
         disable-platform-lib-dir.patch
         fix-stl-build-vs2019-16.6.patch
+        fix-expat.patch
 )
 
 set(OPTIONS)
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+if(VCPKG_TARGET_IS_OSX)
     set(OPTIONS -DCOTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES=9999)
 endif()
 
@@ -71,4 +74,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/mswud)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/msvc)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-file(INSTALL ${SOURCE_PATH}/docs/licence.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/docs/licence.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+\ No newline at end of file