mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-04 03:09:07 +08:00
[zstd] Update to version 1.5.6. (#38080)
- [X] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [X] SHA512s are updated for each updated download. - [ ] The "supports" clause reflects platforms that may be fixed by this new version. - [ ] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file. - [ ] Any patches that are no longer applied are deleted from the port's directory. - [X] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [X] Only one version is added to each modified port's versions file. --------- Co-authored-by: Jim wang (BEYONDSOFT CONSULTING INC) <v-wangjim@microsoft.com>
This commit is contained in:
parent
a80db28939
commit
2f3fccd1e7
13
ports/zstd/fix-windows-rc-compile.patch
Normal file
13
ports/zstd/fix-windows-rc-compile.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
|
||||
index 5d514ccb..dd79efb7 100644
|
||||
--- a/build/cmake/lib/CMakeLists.txt
|
||||
+++ b/build/cmake/lib/CMakeLists.txt
|
||||
@@ -123,7 +123,7 @@ set(PUBLIC_INCLUDE_DIRS ${LIBRARY_DIR})
|
||||
set(library_targets)
|
||||
if (ZSTD_BUILD_SHARED)
|
||||
add_library(libzstd_shared SHARED ${Sources} ${Headers} ${PlatformDependResources})
|
||||
- target_include_directories(libzstd_shared INTERFACE $<BUILD_INTERFACE:${PUBLIC_INCLUDE_DIRS}>)
|
||||
+ target_include_directories(libzstd_shared PUBLIC $<BUILD_INTERFACE:${PUBLIC_INCLUDE_DIRS}>)
|
||||
list(APPEND library_targets libzstd_shared)
|
||||
if (ZSTD_MULTITHREAD_SUPPORT)
|
||||
set_property(TARGET libzstd_shared APPEND PROPERTY COMPILE_DEFINITIONS "ZSTD_MULTITHREAD")
|
@ -2,11 +2,12 @@ vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO facebook/zstd
|
||||
REF "v${VERSION}"
|
||||
SHA512 356994e0d8188ce97590bf86b602eb50cbcb2f951594afb9c2d6e03cc68f966862505afc4a50e76efd55e4cfb11dbc9b15c7837b7827a961a1311ef72cd23505
|
||||
SHA512 ca12dffd86618ca008e1ecc79056c1129cb4e61668bf13a3cd5b2fa5c93bc9c92c80f64c1870c68b9c20009d9b3a834eac70db72242d5106125a1c53cccf8de8
|
||||
HEAD_REF dev
|
||||
PATCHES
|
||||
no-static-suffix.patch
|
||||
fix-emscripten-and-clang-cl.patch
|
||||
fix-windows-rc-compile.patch
|
||||
)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ZSTD_BUILD_STATIC)
|
||||
|
@ -1,4 +1,4 @@
|
||||
The package zstd provides CMake targets:
|
||||
zstd provides CMake targets:
|
||||
|
||||
find_package(zstd CONFIG REQUIRED)
|
||||
target_link_libraries(main PRIVATE $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>)
|
||||
find_package(zstd CONFIG REQUIRED)
|
||||
target_link_libraries(main PRIVATE zstd::libzstd)
|
||||
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "zstd",
|
||||
"version": "1.5.5",
|
||||
"port-version": 2,
|
||||
"version": "1.5.6",
|
||||
"description": "Zstandard - Fast real-time compression algorithm",
|
||||
"homepage": "https://facebook.github.io/zstd/",
|
||||
"license": "BSD-3-Clause OR GPL-2.0-only",
|
||||
|
@ -9641,8 +9641,8 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"zstd": {
|
||||
"baseline": "1.5.5",
|
||||
"port-version": 2
|
||||
"baseline": "1.5.6",
|
||||
"port-version": 0
|
||||
},
|
||||
"zstr": {
|
||||
"baseline": "1.0.7",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "796171d4d359b6786b8e1380fb6da8e677a9087b",
|
||||
"version": "1.5.6",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "259dc461801ecb946995e13fd3d94b1381d02441",
|
||||
"version": "1.5.5",
|
||||
|
Loading…
Reference in New Issue
Block a user