зеркало из https://github.com/microsoft/vcpkg.git
[zstd] Revise thread lib export
This commit is contained in:
Родитель
eb45aebef8
Коммит
a99e6378a6
|
@ -1,13 +1,14 @@
|
||||||
diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
|
diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
|
||||||
index 5f75665..dabc9d5 100644
|
index b12511b..6a5d563 100644
|
||||||
--- a/build/cmake/lib/CMakeLists.txt
|
--- a/build/cmake/lib/CMakeLists.txt
|
||||||
+++ b/build/cmake/lib/CMakeLists.txt
|
+++ b/build/cmake/lib/CMakeLists.txt
|
||||||
@@ -130,7 +130,7 @@ if (ZSTD_BUILD_STATIC)
|
@@ -135,7 +135,8 @@ if (ZSTD_BUILD_STATIC)
|
||||||
OUTPUT_NAME ${STATIC_LIBRARY_BASE_NAME})
|
OUTPUT_NAME ${STATIC_LIBRARY_BASE_NAME})
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
-if (UNIX OR MINGW)
|
-if (UNIX OR MINGW)
|
||||||
+if (1)
|
+if (1)
|
||||||
|
+ list(APPEND LIBS_PRIVATE ${THREADS_LIBS})
|
||||||
# pkg-config
|
# pkg-config
|
||||||
set(PREFIX "${CMAKE_INSTALL_PREFIX}")
|
set(PREFIX "${CMAKE_INSTALL_PREFIX}")
|
||||||
set(EXEC_PREFIX "\${prefix}")
|
set(EXEC_PREFIX "\${prefix}")
|
|
@ -6,7 +6,7 @@ vcpkg_from_github(
|
||||||
SHA512 e107508a41fca50845cc2494e64adaba93efb95a2fa486fc962510a8ba4b2180d93067cae9870f119e88e5e8b28a046bc2240b0b23cdd8933d1fb1a6a9668c1e
|
SHA512 e107508a41fca50845cc2494e64adaba93efb95a2fa486fc962510a8ba4b2180d93067cae9870f119e88e5e8b28a046bc2240b0b23cdd8933d1fb1a6a9668c1e
|
||||||
HEAD_REF dev
|
HEAD_REF dev
|
||||||
PATCHES
|
PATCHES
|
||||||
install_pkgpc.patch
|
pkgconfig.patch
|
||||||
no-static-suffix.patch
|
no-static-suffix.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -30,14 +30,6 @@ vcpkg_copy_pdbs()
|
||||||
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/zstd)
|
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/zstd)
|
||||||
vcpkg_fixup_pkgconfig()
|
vcpkg_fixup_pkgconfig()
|
||||||
|
|
||||||
file(READ "${CURRENT_PACKAGES_DIR}/share/zstd/zstdTargets.cmake" targets)
|
|
||||||
if(targets MATCHES "-pthread")
|
|
||||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libzstd.pc" " -lzstd" " -lzstd -pthread")
|
|
||||||
if(NOT VCPKG_BUILD_TYPE)
|
|
||||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libzstd.pc" " -lzstd" " -lzstd -pthread")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||||
|
|
||||||
if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "zstd",
|
"name": "zstd",
|
||||||
"version": "1.5.2",
|
"version": "1.5.2",
|
||||||
"port-version": 2,
|
"port-version": 3,
|
||||||
"description": "Zstandard - Fast real-time compression algorithm",
|
"description": "Zstandard - Fast real-time compression algorithm",
|
||||||
"homepage": "https://facebook.github.io/zstd/",
|
"homepage": "https://facebook.github.io/zstd/",
|
||||||
"license": "BSD-3-Clause OR GPL-2.0-only",
|
"license": "BSD-3-Clause OR GPL-2.0-only",
|
||||||
|
|
|
@ -8350,7 +8350,7 @@
|
||||||
},
|
},
|
||||||
"zstd": {
|
"zstd": {
|
||||||
"baseline": "1.5.2",
|
"baseline": "1.5.2",
|
||||||
"port-version": 2
|
"port-version": 3
|
||||||
},
|
},
|
||||||
"zstr": {
|
"zstr": {
|
||||||
"baseline": "1.0.4",
|
"baseline": "1.0.4",
|
||||||
|
|
|
@ -1,5 +1,10 @@
|
||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "445f601b93f426e599df12ab5e329b33a3749fc1",
|
||||||
|
"version": "1.5.2",
|
||||||
|
"port-version": 3
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "00fe0b76a4eb8d8dad230e931e1f83ed281f13b4",
|
"git-tree": "00fe0b76a4eb8d8dad230e931e1f83ed281f13b4",
|
||||||
"version": "1.5.2",
|
"version": "1.5.2",
|
||||||
|
|
Загрузка…
Ссылка в новой задаче