mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
[libarchive] Update to 3.7.4. (#40271)
This commit is contained in:
parent
dc954f0a47
commit
c6f685954a
@ -2,7 +2,7 @@ vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO libarchive/libarchive
|
||||
REF "v${VERSION}"
|
||||
SHA512 86a4e325879cde826df068d1154ccf031bbca7a0afa3f2afc57fa41322af245ec477db9fb38fff298c9e269261de1a2ece7849ae1a3512e0ebeb8414167372c0
|
||||
SHA512 adc9ee1f2145947c8bfcfb94873053669c5c139a8ac30d97888032e50740840a5dbaa391b9782a89886f46c6d75d2f0e5b00c353e727788a1cb4998b62c5361b
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
disable-warnings.patch
|
||||
|
@ -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)
|
||||
target_include_directories(main PRIVATE ${LibArchive_INCLUDE_DIRS})
|
||||
target_link_libraries(main PRIVATE ${LibArchive_LIBRARIES})
|
||||
find_package(LibArchive REQUIRED)
|
||||
target_link_libraries(main PRIVATE LibArchive::LibArchive) # since CMake 3.17
|
||||
|
||||
find_package(LibArchive REQUIRED)
|
||||
target_link_libraries(main PRIVATE LibArchive::LibArchive) # CMake >= 3.17
|
||||
libarchive provides pkg-config modules:
|
||||
|
||||
# library that can create and read several streaming archive formats
|
||||
libarchive
|
||||
|
@ -15,23 +15,23 @@ if(LibArchive_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
|
||||
set(z_vcpkg_libarchive_libs "")
|
||||
find_package(ZLIB ${z_vcpkg_libarchive_args})
|
||||
list(APPEND z_vcpkg_libarchive_libs ZLIB::ZLIB)
|
||||
if(@ENABLE_BZip2@)
|
||||
if("@ENABLE_BZip2@")
|
||||
find_package(BZip2 ${z_vcpkg_libarchive_args})
|
||||
list(APPEND z_vcpkg_libarchive_libs BZip2::BZip2)
|
||||
endif()
|
||||
if(@ENABLE_LIBXML2@)
|
||||
if("@ENABLE_LIBXML2@")
|
||||
find_package(LibXml2 ${z_vcpkg_libarchive_args})
|
||||
list(APPEND z_vcpkg_libarchive_libs LibXml2::LibXml2)
|
||||
endif()
|
||||
if(@ENABLE_LZ4@)
|
||||
if("@ENABLE_LZ4@")
|
||||
find_package(lz4 CONFIG ${z_vcpkg_libarchive_args})
|
||||
list(APPEND z_vcpkg_libarchive_libs lz4::lz4)
|
||||
endif()
|
||||
if(@ENABLE_LZMA@)
|
||||
if("@ENABLE_LZMA@")
|
||||
find_package(LibLZMA ${z_vcpkg_libarchive_args})
|
||||
list(APPEND z_vcpkg_libarchive_libs LibLZMA::LibLZMA)
|
||||
endif()
|
||||
if(@ENABLE_LZO@)
|
||||
if("@ENABLE_LZO@")
|
||||
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_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)
|
||||
endif()
|
||||
endif()
|
||||
if(@ENABLE_ZSTD@)
|
||||
if("@ENABLE_ZSTD@")
|
||||
find_package(zstd ${z_vcpkg_libarchive_args})
|
||||
if(TARGET zstd::libzstd_shared)
|
||||
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)
|
||||
list(APPEND z_vcpkg_libarchive_libs zstd::libzstd)
|
||||
endif()
|
||||
if(@WRAPPER_ENABLE_OPENSSL@)
|
||||
if("@WRAPPER_ENABLE_OPENSSL@")
|
||||
find_package(OpenSSL ${z_vcpkg_libarchive_args})
|
||||
list(APPEND z_vcpkg_libarchive_libs OpenSSL::Crypto)
|
||||
endif()
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "libarchive",
|
||||
"version": "3.7.2",
|
||||
"version": "3.7.4",
|
||||
"description": "Library for reading and writing streaming archives",
|
||||
"homepage": "https://www.libarchive.org",
|
||||
"license": null,
|
||||
|
@ -4237,7 +4237,7 @@
|
||||
"port-version": 5
|
||||
},
|
||||
"libarchive": {
|
||||
"baseline": "3.7.2",
|
||||
"baseline": "3.7.4",
|
||||
"port-version": 0
|
||||
},
|
||||
"libass": {
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "36d34d79f7e2c0be777031c76b964d362ded6d4e",
|
||||
"version": "3.7.4",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "72eaf4987dd61116706a4279e7789f2a386a05cf",
|
||||
"version": "3.7.2",
|
||||
|
Loading…
x
Reference in New Issue
Block a user