diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-08-17 23:33:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-17 08:33:44 -0700 |
| commit | d6285bc24b2e48da2f5e057fc759aff7c2b3b0af (patch) | |
| tree | 0ae728a70e64d9758f6a918e515171f83424116b /ports/wxwidgets | |
| parent | 5dd2b6736b7397e740d54ec2d748b56bd56350e9 (diff) | |
| download | vcpkg-d6285bc24b2e48da2f5e057fc759aff7c2b3b0af.tar.gz vcpkg-d6285bc24b2e48da2f5e057fc759aff7c2b3b0af.zip | |
[expat] Update the version to 2.2.9 (add support for uwp) (#9146)
* [expat] Update the version to 2.2.9(support uwp)
* [readosm] Fix expat.lib cannot be found
* Remove expat:arm-uwp and expat:x64-uwp from fail list in ci.baseline.txt
* [apr-util,io2d,skia] Fix expat cannot be found and also update expat
* [many ports] Add supports and fix the regressions
* Fix new regressions
* Fix typo
* [io2d] Update expat patch
* [io2d,libkml,skia] Fix expat cannot find and also fix typo
* [expat] Remove usage
* [libkml,vtk] Update expat patch and fix static build
* [wxwidgets] Fix static build caused by expat cannot found
* Update as review suggestion
* Add Port-Version
* Remove evpp:x64-osx=fail from ci.baseline.txt
* [wxwidgest] Remove unnecessary spaces
* [itk] Fix expat cannot be found
* fix cmake test port
* [wxwidgets] Update Port-Version
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'ports/wxwidgets')
| -rw-r--r-- | ports/wxwidgets/CONTROL | 5 | ||||
| -rw-r--r-- | ports/wxwidgets/fix-expat.patch | 24 | ||||
| -rw-r--r-- | ports/wxwidgets/portfile.cmake | 7 |
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 |