diff options
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) |