mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 11:58:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[libarchive] Fix static linking dependencies (#16082)

Browse Source
This commit is contained in:
DDoSolitary 2021-04-20 08:14:07 +08:00 committed by GitHub
parent 1045e88e42
commit cc1aef5a12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/libarchive/portfile.cmake
View File

@ -42,6 +42,8 @@ else()
endif() endif()
list(APPEND FEATURE_OPTIONS -DENABLE_ZLIB=ON) list(APPEND FEATURE_OPTIONS -DENABLE_ZLIB=ON)
# Needed for configure_file
set(ENABLE_ZLIB ON)
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}

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

@ -89,13 +89,7 @@ if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${interface_lib}) set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${interface_lib})
endif() endif()
if(@ENABLE_ZSTD@) if(@ENABLE_ZSTD@)
if(ZSTD_LIBRARY_RELEASE) target_link_libraries(LibArchive::LibArchive INTERFACE zstd::libzstd_static)
list(APPEND interface_lib \$<\$<NOT:\$<CONFIG:DEBUG>>:${ZSTD_LIBRARY_RELEASE}>)
endif()
if(ZSTD_LIBRARY_DEBUG)
list(APPEND interface_lib \$<\$<CONFIG:DEBUG>:${ZSTD_LIBRARY_DEBUG}>)
endif()
set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${interface_lib})
endif() endif()
if(@ENABLE_OPENSSL@) if(@ENABLE_OPENSSL@)
target_link_libraries(LibArchive::LibArchive INTERFACE OpenSSL::Crypto) target_link_libraries(LibArchive::LibArchive INTERFACE OpenSSL::Crypto)

2
ports/libarchive/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "libarchive", "name": "libarchive",
"version-semver": "3.4.3", "version-semver": "3.4.3",
"port-version": 4, "port-version": 5,
"description": "Library for reading and writing streaming archives", "description": "Library for reading and writing streaming archives",
"homepage": "https://github.com/libarchive/libarchive", "homepage": "https://github.com/libarchive/libarchive",
"supports": "!uwp", "supports": "!uwp",

2
versions/baseline.json
View File

@ -2942,7 +2942,7 @@
}, },
"libarchive": { "libarchive": {
"baseline": "3.4.3", "baseline": "3.4.3",
"port-version": 4 "port-version": 5
}, },
"libass": { "libass": {
"baseline": "0.15.0", "baseline": "0.15.0",

5
versions/l-/libarchive.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "a8318f61dfe300b1b980b2ecaf295bd626572ad4",
"version-semver": "3.4.3",
"port-version": 5
},
{ {
"git-tree": "1246e0e0cd6bc4f0987fa5f5a130dc3b2e071285", "git-tree": "1246e0e0cd6bc4f0987fa5f5a130dc3b2e071285",
"version-semver": "3.4.3", "version-semver": "3.4.3",