diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-08-28 07:20:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-27 22:20:06 -0700 |
| commit | 53a47bca4f5574bc3c7630d8e07b1fc8f580165f (patch) | |
| tree | 37d50100c3e2ba52ec553f18cea45fd8db4f55c3 /ports/libkml | |
| parent | 2f52c7cbaa13650c525c843af4699fda19c819f7 (diff) | |
| download | vcpkg-53a47bca4f5574bc3c7630d8e07b1fc8f580165f.tar.gz vcpkg-53a47bca4f5574bc3c7630d8e07b1fc8f580165f.zip | |
[expat] Fix a few details with expat. (#13022)
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Diffstat (limited to 'ports/libkml')
| -rw-r--r-- | ports/libkml/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libkml/fix-expat.patch | 20 | ||||
| -rw-r--r-- | ports/libkml/portfile.cmake | 1 |
3 files changed, 1 insertions, 22 deletions
diff --git a/ports/libkml/CONTROL b/ports/libkml/CONTROL index 06dbb7bde..33de1219b 100644 --- a/ports/libkml/CONTROL +++ b/ports/libkml/CONTROL @@ -1,6 +1,6 @@ Source: libkml Version: 1.3.0 -Port-Version: 5 +Port-Version: 6 Homepage: https://github.com/libkml/libkml Description: Reference implementation of OGC KML 2.2 Build-Depends: zlib, expat, minizip[bzip2], uriparser, boost-smart-ptr
\ No newline at end of file diff --git a/ports/libkml/fix-expat.patch b/ports/libkml/fix-expat.patch deleted file mode 100644 index e4a09d187..000000000 --- a/ports/libkml/fix-expat.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9728ead..f9e8051 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -93,8 +93,13 @@ set(MINIZIP_DEPENDS "" CACHE INTERNAL "MINIZIP_DEPENDS")
-
- set(LIBKML_TARGETS)
-
--find_package(EXPAT)
--if(EXPAT_FOUND)
-+find_package(expat CONFIG REQUIRED)
-+if(WIN32 AND NOT MINGW)
-+ set(EXPAT_LIBRARY expat::libexpat)
-+else()
-+ set(EXPAT_LIBRARY expat::expat)
-+endif()
-+if(EXPAT_LIBRARY)
- include_directories(${EXPAT_INCLUDE_DIR})
- else()
- include(External_expat)
diff --git a/ports/libkml/portfile.cmake b/ports/libkml/portfile.cmake index 4370aa40e..581a3b608 100644 --- a/ports/libkml/portfile.cmake +++ b/ports/libkml/portfile.cmake @@ -6,7 +6,6 @@ vcpkg_from_github( HEAD_REF master PATCHES patch_empty_literal_on_vc.patch - fix-expat.patch ) file(REMOVE ${SOURCE_PATH}/cmake/External_boost.cmake) |