Browse Source
Version 1.3.2 has these key changes: - Address the findings of the just-completed 7ASecurity audit - Completely rewrite the cmake support (thanks to @Vollstrecker) - Support non-blocking devices with the gz* functions - Many other enhancements, fixes, and portability improvements https://github.com/madler/zlib/releases/tag/v1.3.2pull/200/head
3 changed files with 23 additions and 31 deletions
@ -1,34 +1,32 @@ |
|||||
From 32e97d1efafa48d81c3d019d7d5fe7083a812768 Mon Sep 17 00:00:00 2001 |
From 2a425593750d2056fb45ee452835cbebb0c060a9 Mon Sep 17 00:00:00 2001 |
||||
From: Steve Lhomme <robux4@ycbcr.xyz> |
From: Steve Lhomme <robux4@ycbcr.xyz> |
||||
Date: Mon, 12 Feb 2024 20:39:05 +0100 |
Date: Mon, 12 Feb 2024 20:39:05 +0100 |
||||
Subject: [PATCH] CMakeList.txt: force static library name to `z` |
Subject: [PATCH] CMakeList.txt: force static library name to `z` |
||||
|
|
||||
They build code in a UNIX like environment but CMake doesn't set UNIX |
Otherwise it doesn't match the name in the pkg-config file. |
||||
for it. |
|
||||
|
|
||||
In contribs, we can always enforce this value. |
|
||||
|
|
||||
Co-authored-by: Alexandre Janniaux <ajanni@videolabs.io> |
|
||||
---
|
---
|
||||
CMakeLists.txt | 4 ++-- |
CMakeLists.txt | 8 ++++---- |
||||
1 file changed, 2 insertions(+), 2 deletions(-) |
1 file changed, 4 insertions(+), 4 deletions(-) |
||||
|
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 15ceebe..c952cde 100644
|
index e103c40..438ec64 100644
|
||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||
@@ -167,9 +167,9 @@ if(NOT CYGWIN)
|
@@ -149,10 +149,10 @@ set(ZLIB_SRCS
|
||||
set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION}) |
uncompr.c |
||||
endif() |
zutil.c) |
||||
|
|
||||
|
-if(WIN32)
|
||||
|
- set(zlib_static_suffix "s")
|
||||
|
- set(CMAKE_DEBUG_POSTFIX "d")
|
||||
|
-endif(WIN32)
|
||||
|
+# if(WIN32)
|
||||
|
+# set(zlib_static_suffix "s")
|
||||
|
+# set(CMAKE_DEBUG_POSTFIX "d")
|
||||
|
+# endif(WIN32)
|
||||
|
|
||||
+# On unix-like platforms the library is almost always called libz
|
if(ZLIB_BUILD_SHARED) |
||||
+set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
|
add_library( |
||||
if(UNIX) |
|
||||
- # On unix-like platforms the library is almost always called libz
|
|
||||
- set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
|
|
||||
if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX)) |
|
||||
set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") |
|
||||
endif() |
|
||||
--
|
--
|
||||
2.43.0 |
2.52.0.windows.1 |
||||
|
|
||||
|
|||||
@ -1 +1 @@ |
|||||
1e8e70b362d64a233591906a1f50b59001db04ca14aaffad522198b04680be501736e7d536b4191e2f99767e7001ca486cd802362cca2be05d5d409b83ea732d zlib-1.3.1.tar.xz |
cf3d49fbabddc57cca99858feeca8f910e9de42a16014cddd406814d2d24ee33fee2af3805d7efbb1b04b05f55818092b000daf82502b675df65f2512c353f73 zlib-1.3.2.tar.xz |
||||
|
|||||
Loading…
Reference in new issue