aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordriver1998 <driver1998@foxmail.com>2019-08-24 00:17:51 +0800
committerCurtis J Bezault <curtbezault@gmail.com>2019-08-23 09:17:51 -0700
commit344513b2ed7a653a38d08e8c08a2dd7eb8ac855c (patch)
treef91ad870f5bc906b869c8ad571eee73d780b2cbf
parentd926adaa9da75af34a6408df34a199fe0074c45b (diff)
downloadvcpkg-344513b2ed7a653a38d08e8c08a2dd7eb8ac855c.tar.gz
vcpkg-344513b2ed7a653a38d08e8c08a2dd7eb8ac855c.zip
[wxwidgets] Windows ARM support (#7833)
-rw-r--r--ports/wxwidgets/CONTROL2
-rw-r--r--ports/wxwidgets/portfile.cmake7
2 files changed, 8 insertions, 1 deletions
diff --git a/ports/wxwidgets/CONTROL b/ports/wxwidgets/CONTROL
index 542fdf327..4d6c57e13 100644
--- a/ports/wxwidgets/CONTROL
+++ b/ports/wxwidgets/CONTROL
@@ -1,5 +1,5 @@
Source: wxwidgets
-Version: 3.1.2-1
+Version: 3.1.2-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
diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake
index 7319f9749..0f946d8d7 100644
--- a/ports/wxwidgets/portfile.cmake
+++ b/ports/wxwidgets/portfile.cmake
@@ -13,6 +13,13 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
set(OPTIONS -DCOTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES=9999)
endif()
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 OR VCPKG_TARGET_ARCHITECTURE STREQUAL arm)
+ set(OPTIONS
+ -DwxUSE_OPENGL=OFF
+ -DwxUSE_STACKWALKER=OFF
+ )
+endif()
+
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA