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/vtk | |
| 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/vtk')
| -rw-r--r-- | ports/vtk/FindExpat.patch | 13 | ||||
| -rw-r--r-- | ports/vtk/portfile.cmake | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/ports/vtk/FindExpat.patch b/ports/vtk/FindExpat.patch new file mode 100644 index 000000000..a0e706b44 --- /dev/null +++ b/ports/vtk/FindExpat.patch @@ -0,0 +1,13 @@ +diff --git a/CMake/FindEXPAT.cmake b/CMake/FindEXPAT.cmake
+index 9d4c080..9e14e7d 100644
+--- a/CMake/FindEXPAT.cmake
++++ b/CMake/FindEXPAT.cmake
+@@ -40,7 +40,7 @@ pkg_check_modules(PC_EXPAT QUIET expat)
+ find_path(EXPAT_INCLUDE_DIR NAMES expat.h HINTS ${PC_EXPAT_INCLUDE_DIRS})
+
+ # Look for the library.
+-find_library(EXPAT_LIBRARY NAMES expat libexpat HINTS ${PC_EXPAT_LIBRARY_DIRS})
++find_library(EXPAT_LIBRARY NAMES expat libexpat libexpatMD HINTS ${PC_EXPAT_LIBRARY_DIRS})
+
+ if (EXPAT_INCLUDE_DIR AND EXISTS "${EXPAT_INCLUDE_DIR}/expat.h")
+ file(STRINGS "${EXPAT_INCLUDE_DIR}/expat.h" expat_version_str
diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 089dc11b6..d657f241f 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -120,6 +120,7 @@ vcpkg_from_github( python_debug.patch fix-using-hdf5.patch # Last patch TODO: Patch out internal loguru + FindExpat.patch ) # ============================================================================= |