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/poco | |
| 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/poco')
| -rw-r--r-- | ports/poco/CONTROL | 2 | ||||
| -rw-r--r-- | ports/poco/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/poco/use-vcpkg-expat.patch | 18 |
3 files changed, 1 insertions, 20 deletions
diff --git a/ports/poco/CONTROL b/ports/poco/CONTROL index 17c74d0aa..939a74945 100644 --- a/ports/poco/CONTROL +++ b/ports/poco/CONTROL @@ -1,6 +1,6 @@ Source: poco Version: 1.9.2 -Port-Version: 3 +Port-Version: 4 Build-Depends: expat, libpq, pcre, sqlite3, zlib, libpng Description: Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems. Homepage: https://github.com/pocoproject/poco diff --git a/ports/poco/portfile.cmake b/ports/poco/portfile.cmake index 18418e864..184db9c73 100644 --- a/ports/poco/portfile.cmake +++ b/ports/poco/portfile.cmake @@ -16,7 +16,6 @@ vcpkg_from_github( # Add the support of arm64-windows arm64_pcre.patch fix_foundation_link.patch - use-vcpkg-expat.patch ) # define Poco linkage type diff --git a/ports/poco/use-vcpkg-expat.patch b/ports/poco/use-vcpkg-expat.patch deleted file mode 100644 index ee1990b9e..000000000 --- a/ports/poco/use-vcpkg-expat.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/XML/CMakeLists.txt b/XML/CMakeLists.txt
-index d4a502a..780f5d0 100644
---- a/XML/CMakeLists.txt
-+++ b/XML/CMakeLists.txt
-@@ -23,7 +23,12 @@ endif()
- # If POCO_UNBUNDLED is enabled we try to find the required packages
- # The configuration will fail if the packages are not found
- if (POCO_UNBUNDLED)
-- 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()
- set(SYSLIBS ${SYSLIBS} ${EXPAT_LIBRARIES})
- include_directories(${EXPAT_INCLUDE_DIRS})
- else()
|