Skip to content
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.

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

[libarchive] Fix static linking dependencies #16082

Merged
merged 1 commit into from
Apr 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions ports/libarchive/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ else()
endif()

list(APPEND FEATURE_OPTIONS -DENABLE_ZLIB=ON)
# Needed for configure_file
set(ENABLE_ZLIB ON)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
Expand Down
8 changes: 1 addition & 7 deletions ports/libarchive/vcpkg-cmake-wrapper.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,7 @@ if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${interface_lib})
endif()
if(@ENABLE_ZSTD@)
if(ZSTD_LIBRARY_RELEASE)
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})
target_link_libraries(LibArchive::LibArchive INTERFACE zstd::libzstd_static)
endif()
if(@ENABLE_OPENSSL@)
target_link_libraries(LibArchive::LibArchive INTERFACE OpenSSL::Crypto)
Expand Down
2 changes: 1 addition & 1 deletion ports/libarchive/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libarchive",
"version-semver": "3.4.3",
"port-version": 4,
"port-version": 5,
"description": "Library for reading and writing streaming archives",
"homepage": "https://github.com/libarchive/libarchive",
"supports": "!uwp",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2926,7 +2926,7 @@
},
"libarchive": {
"baseline": "3.4.3",
"port-version": 4
"port-version": 5
},
"libass": {
"baseline": "0.15.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libarchive.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a8318f61dfe300b1b980b2ecaf295bd626572ad4",
"version-semver": "3.4.3",
"port-version": 5
},
{
"git-tree": "1246e0e0cd6bc4f0987fa5f5a130dc3b2e071285",
"version-semver": "3.4.3",
Expand Down