3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 03:10:57 +08:00
Code Issues Projects Releases Wiki Activity

[libarchive] Update to 3.7.4. (#40271)

Browse Source
This commit is contained in:
Kai Pastor 2024-08-06 05:30:14 +02:00 committed by GitHub
parent dc954f0a47
commit c6f685954a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/libarchive/portfile.cmake
View File

@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO libarchive/libarchive REPO libarchive/libarchive
REF "v${VERSION}" REF "v${VERSION}"
SHA512 86a4e325879cde826df068d1154ccf031bbca7a0afa3f2afc57fa41322af245ec477db9fb38fff298c9e269261de1a2ece7849ae1a3512e0ebeb8414167372c0 SHA512 adc9ee1f2145947c8bfcfb94873053669c5c139a8ac30d97888032e50740840a5dbaa391b9782a89886f46c6d75d2f0e5b00c353e727788a1cb4998b62c5361b
HEAD_REF master HEAD_REF master
PATCHES PATCHES
disable-warnings.patch disable-warnings.patch

13
ports/libarchive/usage
View File

@ -1,8 +1,9 @@
The package libarchive is compatible with the CMake Find Module: libarchive is compatible with the CMake Find Module:
find_package(LibArchive REQUIRED) find_package(LibArchive REQUIRED)
target_include_directories(main PRIVATE ${LibArchive_INCLUDE_DIRS}) target_link_libraries(main PRIVATE LibArchive::LibArchive) # since CMake 3.17
target_link_libraries(main PRIVATE ${LibArchive_LIBRARIES})
find_package(LibArchive REQUIRED) libarchive provides pkg-config modules:
target_link_libraries(main PRIVATE LibArchive::LibArchive) # CMake >= 3.17
# library that can create and read several streaming archive formats
libarchive

20
ports/libarchive/vcpkg-cmake-wrapper.cmake.in
View File

@ -15,23 +15,23 @@ if(LibArchive_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
set(z_vcpkg_libarchive_libs "") set(z_vcpkg_libarchive_libs "")
find_package(ZLIB ${z_vcpkg_libarchive_args}) find_package(ZLIB ${z_vcpkg_libarchive_args})
list(APPEND z_vcpkg_libarchive_libs ZLIB::ZLIB) list(APPEND z_vcpkg_libarchive_libs ZLIB::ZLIB)
if(@ENABLE_BZip2@) if("@ENABLE_BZip2@")
find_package(BZip2 ${z_vcpkg_libarchive_args}) find_package(BZip2 ${z_vcpkg_libarchive_args})
list(APPEND z_vcpkg_libarchive_libs BZip2::BZip2) list(APPEND z_vcpkg_libarchive_libs BZip2::BZip2)
endif() endif()
if(@ENABLE_LIBXML2@) if("@ENABLE_LIBXML2@")
find_package(LibXml2 ${z_vcpkg_libarchive_args}) find_package(LibXml2 ${z_vcpkg_libarchive_args})
list(APPEND z_vcpkg_libarchive_libs LibXml2::LibXml2) list(APPEND z_vcpkg_libarchive_libs LibXml2::LibXml2)
endif() endif()
if(@ENABLE_LZ4@) if("@ENABLE_LZ4@")
find_package(lz4 CONFIG ${z_vcpkg_libarchive_args}) find_package(lz4 CONFIG ${z_vcpkg_libarchive_args})
list(APPEND z_vcpkg_libarchive_libs lz4::lz4) list(APPEND z_vcpkg_libarchive_libs lz4::lz4)
endif() endif()
if(@ENABLE_LZMA@) if("@ENABLE_LZMA@")
find_package(LibLZMA ${z_vcpkg_libarchive_args}) find_package(LibLZMA ${z_vcpkg_libarchive_args})
list(APPEND z_vcpkg_libarchive_libs LibLZMA::LibLZMA) list(APPEND z_vcpkg_libarchive_libs LibLZMA::LibLZMA)
endif() endif()
if(@ENABLE_LZO@) if("@ENABLE_LZO@")
include(SelectLibraryConfigurations) include(SelectLibraryConfigurations)
find_library(Z_VCPKG_LZO_LIBRARY_DEBUG NAMES lzo2d lzo2 NAMES_PER_DIR PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) find_library(Z_VCPKG_LZO_LIBRARY_DEBUG NAMES lzo2d lzo2 NAMES_PER_DIR PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH)
find_library(Z_VCPKG_LZO_LIBRARY_RELEASE NAMES lzo2 NAMES_PER_DIR PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) find_library(Z_VCPKG_LZO_LIBRARY_RELEASE NAMES lzo2 NAMES_PER_DIR PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH)
@ -42,15 +42,11 @@ if(LibArchive_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
set(LibArchive_FOUND FALSE) set(LibArchive_FOUND FALSE)
endif() endif()
endif() endif()
if(@ENABLE_ZSTD@) if("@ENABLE_ZSTD@")
find_package(zstd ${z_vcpkg_libarchive_args}) find_package(zstd ${z_vcpkg_libarchive_args})
if(TARGET zstd::libzstd_shared) list(APPEND z_vcpkg_libarchive_libs zstd::libzstd)
list(APPEND z_vcpkg_libarchive_libs zstd::libzstd_shared)
else(TARGET zstd::libzstd_shared)
list(APPEND z_vcpkg_libarchive_libs zstd::libzstd_static)
endif(TARGET zstd::libzstd_shared)
endif() endif()
if(@WRAPPER_ENABLE_OPENSSL@) if("@WRAPPER_ENABLE_OPENSSL@")
find_package(OpenSSL ${z_vcpkg_libarchive_args}) find_package(OpenSSL ${z_vcpkg_libarchive_args})
list(APPEND z_vcpkg_libarchive_libs OpenSSL::Crypto) list(APPEND z_vcpkg_libarchive_libs OpenSSL::Crypto)
endif() endif()

2
ports/libarchive/vcpkg.json
View File

@ -1,6 +1,6 @@
{ {
"name": "libarchive", "name": "libarchive",
"version": "3.7.2", "version": "3.7.4",
"description": "Library for reading and writing streaming archives", "description": "Library for reading and writing streaming archives",
"homepage": "https://www.libarchive.org", "homepage": "https://www.libarchive.org",
"license": null, "license": null,

2
versions/baseline.json
View File

@ -4237,7 +4237,7 @@
"port-version": 5 "port-version": 5
}, },
"libarchive": { "libarchive": {
"baseline": "3.7.2", "baseline": "3.7.4",
"port-version": 0 "port-version": 0
}, },
"libass": { "libass": {

5
versions/l-/libarchive.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "36d34d79f7e2c0be777031c76b964d362ded6d4e",
"version": "3.7.4",
"port-version": 0
},
{ {
"git-tree": "72eaf4987dd61116706a4279e7789f2a386a05cf", "git-tree": "72eaf4987dd61116706a4279e7789f2a386a05cf",
"version": "3.7.2", "version": "3.7.2",