mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 09:29:07 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[libzippp] fix find lzma (#15486)

Browse Source 
* Adds patch to fix find lzma after changes to use upstream CMakeLists.txt
* Reference Issue: [libzippp] x64-windows build failure after liblzma use upstream CMakeLists.txt + Add pkgconfig. (#14615) #14679 https://github.com/microsoft/vcpkg/issues/14679
* Reference Commit: PR [liblzma] use upstream CMakeLists.txt + Add pkgconfig. (#14615) eb895b95aa
This commit is contained in:
General Jack O'Neill 2021-01-08 15:03:08 -05:00 committed by GitHub
parent 1ef1ed0d82
commit 31b95c6b4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/libzippp/CONTROL
View File

@ -1,6 +1,6 @@
Source: libzippp
Version: 4.0-1.7.3
Port-Version: 2
Port-Version: 3
Homepage: https://github.com/ctabin/libzippp
Description: Simple basic C++ wrapper around the libzip library. It is meant to be a portable and easy-to-use library for ZIP handling
Build-Depends: zlib, libzip[core,bzip2]

13
ports/libzippp/fix-find-lzma.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/cmake/FindLIBZIP.cmake b/cmake/FindLIBZIP.cmake
index c51c09a..a32bb13 100644
--- a/cmake/FindLIBZIP.cmake
+++ b/cmake/FindLIBZIP.cmake
@@ -50,7 +50,7 @@ if (LIBZIP_FOUND)
set_property(TARGET libzip::zip APPEND PROPERTY INTERFACE_LINK_LIBRARIES Nettle::Nettle)
endif()
if(_have_extra_libs MATCHES "-llzma")
- find_package(LibLZMA::LibLZMA REQUIRED)
+ find_package(LibLZMA REQUIRED)
set_property(TARGET libzip::zip APPEND PROPERTY INTERFACE_LINK_LIBRARIES LibLZMA::LibLZMA)
endif()
if(_have_extra_libs MATCHES "-lz")

2
ports/libzippp/portfile.cmake
View File

@ -4,6 +4,7 @@ vcpkg_from_github(
REF 791bdc43eb18b87e3bdfa087493e3e32217e672c #v4.0-1.7.3 with CXX std version c++11
SHA512 c6a90ecec21bb2d9e3af681c35d7eec0bee7b356fc1438004dc84be32ee7b94d047c35817d46b222237d54699ea54afa4fd3ae5deeba40dfce4fd2035a38b0e5
HEAD_REF libzippp-v4.0-1.7.3
PATCHES fix-find-lzma.patch
)
vcpkg_check_features(
@ -22,6 +23,7 @@ vcpkg_configure_cmake(
)
vcpkg_install_cmake()
vcpkg_copy_pdbs()
if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_fixup_cmake_targets(CONFIG_PATH "cmake/libzippp")