Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[zstd] Fix mingw pc file (#20852) 

* Don't add _static suffix to mingw pc file

* Update versions

* Update portfile.cmake

Small changes for the format

* Fix name of exported version file

* Update versions

* [skip actions] CI

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
This commit is contained in:
Kai Pastor 2021-10-27 07:58:36 +02:00 committed by GitHub
parent a4548b2ca6
commit 43b616b93a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ports/zstd/portfile.cmake
View File

@ -5,8 +5,8 @@ vcpkg_from_github(
SHA512 659576d0f52d2271b6b53f638b407b873888b1cffe4f014c3149d33a961653c2fcf7ff270bc669a5647205b573ef2809907645a4c89ab6c030ad65bce15547ae
HEAD_REF dev
PATCHES
install_pkgpc.patch
fix-c4703-error.patch
install_pkgpc.patch
fix-c4703-error.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ZSTD_BUILD_STATIC)
@ -38,12 +38,12 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/zstd)
# This enables find_package(ZSTD) and find_package(zstd) to find zstd on Linux(case sensitive filesystems)
file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/zstdConfig.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/zstd-config.cmake")
file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/zstdConfigVersion.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/zstd-configVersion.cmake")
file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/zstdConfigVersion.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/zstd-config-version.cmake")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND VCPKG_TARGET_IS_WINDOWS)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
set(static_suffix "_static")
else()
set(static_suffix )
set(static_suffix "")
endif()
if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libzstd.pc")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libzstd.pc" "-lzstd" "-lzstd${static_suffix}")
@ -65,5 +65,3 @@ endif()
file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(COPY "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "ZSTD is dual licensed - see LICENSE and COPYING files\n")

1
ports/zstd/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "zstd",
"version-semver": "1.5.0",
"port-version": 1,
"description": "Zstandard - Fast real-time compression algorithm",
"homepage": "https://facebook.github.io/zstd/",
"dependencies": [

2
versions/baseline.json
View File

@ -7314,7 +7314,7 @@
},
"zstd": {
"baseline": "1.5.0",
"port-version": 0
"port-version": 1
},
"zstr": {
"baseline": "1.0.4",

5
versions/z-/zstd.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1260425f27dec6dd2e795369d4c28de5a676daef",
"version-semver": "1.5.0",
"port-version": 1
},
{
"git-tree": "b605e1bf30a124c99845c16733aac48289ae6a87",
"version-semver": "1.5.0",