diff options
| author | Kai Pastor <dg0yt@darc.de> | 2021-09-02 22:21:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-02 13:21:52 -0700 |
| commit | 9f73bc1a0e71b8883f20cae72a4e63ce347a3493 (patch) | |
| tree | 56793188593162588fe6e12874c2d505913509c8 /ports/libarchive | |
| parent | bff0e8fc31e4e00a9c2f51b84c9b43bc46478729 (diff) | |
| download | vcpkg-9f73bc1a0e71b8883f20cae72a4e63ce347a3493.tar.gz vcpkg-9f73bc1a0e71b8883f20cae72a4e63ce347a3493.zip | |
Fix target_link_libraries on repeated inclusion of wrappers (#19120)
* Fix repeated inclusion of wrappers
* x-add-version
Diffstat (limited to 'ports/libarchive')
| -rw-r--r-- | ports/libarchive/vcpkg-cmake-wrapper.cmake.in | 14 | ||||
| -rw-r--r-- | ports/libarchive/vcpkg.json | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ports/libarchive/vcpkg-cmake-wrapper.cmake.in b/ports/libarchive/vcpkg-cmake-wrapper.cmake.in index e0712d3e2..81cc39e39 100644 --- a/ports/libarchive/vcpkg-cmake-wrapper.cmake.in +++ b/ports/libarchive/vcpkg-cmake-wrapper.cmake.in @@ -65,19 +65,19 @@ if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") if(TARGET LibArchive::LibArchive)
if(@ENABLE_BZip2@)
- target_link_libraries(LibArchive::LibArchive INTERFACE BZip2::BZip2)
+ set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES BZip2::BZip2)
endif()
if(@ENABLE_ZLIB@)
- target_link_libraries(LibArchive::LibArchive INTERFACE ZLIB::ZLIB)
+ set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES ZLIB::ZLIB)
endif()
if(@ENABLE_LIBXML2@)
- target_link_libraries(LibArchive::LibArchive INTERFACE LibXml2::LibXml2)
+ set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES LibXml2::LibXml2)
endif()
if(@ENABLE_LZ4@)
- target_link_libraries(LibArchive::LibArchive INTERFACE lz4::lz4)
+ set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES lz4::lz4)
endif()
if(@ENABLE_LZMA@)
- target_link_libraries(LibArchive::LibArchive INTERFACE LibLZMA::LibLZMA)
+ set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES LibLZMA::LibLZMA)
endif()
if(@ENABLE_LZO@)
if(LZO_LIBRARY_RELEASE)
@@ -89,10 +89,10 @@ if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${interface_lib})
endif()
if(@ENABLE_ZSTD@)
- target_link_libraries(LibArchive::LibArchive INTERFACE zstd::libzstd_static)
+ set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES zstd::libzstd_static)
endif()
if(@ENABLE_OPENSSL@)
- target_link_libraries(LibArchive::LibArchive INTERFACE OpenSSL::Crypto)
+ set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES OpenSSL::Crypto)
endif()
endif()
endif()
diff --git a/ports/libarchive/vcpkg.json b/ports/libarchive/vcpkg.json index 3d95284a4..53650dc2d 100644 --- a/ports/libarchive/vcpkg.json +++ b/ports/libarchive/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libarchive", "version-semver": "3.4.3", - "port-version": 7, + "port-version": 8, "description": "Library for reading and writing streaming archives", "homepage": "https://github.com/libarchive/libarchive", "supports": "!uwp", |