Skip to content

[libzip] Update to libzip 1.7.3 #13625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ras0219-msft merged 2 commits into from
Sep 24, 2020
Merged

[libzip] Update to libzip 1.7.3 #13625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e06ade1
Update to libzip 1.7.3
Sep 20, 2020
6dafb7c
[libzip] Update CONTROL
LilyWangL Sep 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ports/libzip/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Source: libzip
Version: 1.7.1
Port-Version: 1
Version: 1.7.3
Homepage: https://github.com/nih-at/libzip
Build-Depends: zlib
Default-Features: bzip2,default-aes
Expand Down
32 changes: 7 additions & 25 deletions ports/libzip/fix-findpackage.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,17 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e35082..d90c0c4 100644
index 017f7cf0..9770c158 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -482,7 +482,7 @@ CONFIGURE_PACKAGE_CONFIG_FILE("${PROJECT_NAME}.cmake.in" "${PROJECT_BINARY_DIR}/
IF(LIBZIP_DO_INSTALL)
INSTALL(EXPORT ${PROJECT_NAME}-targets
FILE ${PROJECT_NAME}-targets.cmake
@@ -437,10 +437,10 @@ export(TARGETS zip
if(LIBZIP_DO_INSTALL)
install(FILES ${PROJECT_BINARY_DIR}/zipconf.h DESTINATION include)
install(FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake
)
ENDIF()

@@ -494,7 +494,7 @@ EXPORT(TARGETS zip
IF(LIBZIP_DO_INSTALL)
INSTALL(FILES ${PROJECT_BINARY_DIR}/zipconf.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
INSTALL(FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-version.cmake
install(EXPORT ${PROJECT_NAME}-targets NAMESPACE libzip:: FILE ${PROJECT_NAME}-targets.cmake
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake
)
ENDIF()

diff --git a/libzip.cmake.in b/libzip.cmake.in
index 462439b..6caf754 100644
--- a/libzip.cmake.in
+++ b/libzip.cmake.in
@@ -1,7 +1,7 @@
@PACKAGE_INIT@

# Provide all our library targets to users.
-include("@PACKAGE_CMAKE_INSTALL_LIBDIR@/cmake/libzip/libzip-targets.cmake")
+include("@PACKAGE_CMAKE_INSTALL_LIBDIR@/../share/libzip/libzip-targets.cmake")
endif()

get_filename_component(LIBZIP_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
set(LIBZIP_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
6 changes: 3 additions & 3 deletions ports/libzip/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO nih-at/libzip
REF dcd9a0bfe1ac2893d7f62bafb19f0a4d7b08c0f7 #v1.7.1
SHA512 33ad594398f79544636464d6ae0892553a212dc833b508820f81f10823c3a5c4016288d05953176fb8d52919414edd28f26da6037b93129a58826abdcb501d18
HEAD_REF master
REF 66e496489bdae81bfda8b0088172871d8fda0032 #v1.7.3
SHA512 ae0cda3e9decf5a71bf1e0907a2a21b2c0d83e6e576faf4d9401d6954707ae298c1c09febbc5339f457ace3577fdd405a790c819ef24778990ca6bf1e9516d54
HEAD_REF v1.7.3
PATCHES fix-findpackage.patch
)

Expand Down