Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
185 changes: 150 additions & 35 deletions deps/zlib/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
cmake_minimum_required(VERSION 3.12...3.31)
cmake_minimum_required(VERSION 3.15...3.31)

project(
zlib
LANGUAGES C
VERSION 1.3.2.1
VERSION 1.4
HOMEPAGE_URL "https://zlib.net/"
DESCRIPTION "a general-purpose lossless data-compression library")

Expand All @@ -23,8 +23,8 @@ option(ZLIB_BUILD_TESTING "Enable Zlib Examples as tests" ON)
option(ZLIB_BUILD_SHARED "Enable building zlib shared library" ON)
option(ZLIB_BUILD_STATIC "Enable building zlib static library" ON)
option(ZLIB_INSTALL "Enable installation of zlib" ON)
option(ZLIB_PREFIX "prefix for all types and library functions, see zconf.h.in"
OFF)
set(ZLIB_PREFIX "" CACHE STRING
"prefix for all types and library functions, see zconf.h.in")
mark_as_advanced(ZLIB_PREFIX)

get_property(IS_MULTI GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
Expand All @@ -35,7 +35,7 @@ if(NOT DEFINED CMAKE_BUILD_TYPE AND NOT IS_MULTI)
endif(NOT DEFINED CMAKE_BUILD_TYPE AND NOT IS_MULTI)

include(CheckCSourceCompiles)
include(CheckFunctionExists)
include(CheckSymbolExists)
include(CheckIncludeFile)
include(CMakePackageConfigHelpers)
include(CheckTypeSize)
Expand All @@ -44,12 +44,16 @@ include(GNUInstallDirs)

set(CPACK_INCLUDED TRUE)

set(Z_PREFIX "${ZLIB_PREFIX}")

#
# Create zconf.h.cmakein
#
if(NOT ZLIB_CONF_WRITTEN)
set(Z_PREFIX ${ZLIB_PREFIX})
set(CONF_OUT_FILE ${zlib_BINARY_DIR}/zconf.h.cmakein)
file(READ ${zlib_SOURCE_DIR}/zconf.h ZCONF_CONTENT LIMIT 245)
file(WRITE ${CONF_OUT_FILE} ${ZCONF_CONTENT})
file(APPEND ${CONF_OUT_FILE} "#cmakedefine Z_PREFIX 1\n")
file(APPEND ${CONF_OUT_FILE} "#cmakedefine Z_PREFIX @Z_PREFIX@\n")
file(APPEND ${CONF_OUT_FILE} "#cmakedefine HAVE_STDARG_H 1\n")
file(APPEND ${CONF_OUT_FILE} "#cmakedefine HAVE_UNISTD_H 1\n")
file(READ ${zlib_SOURCE_DIR}/zconf.h ZCONF_CONTENT OFFSET 244)
Expand Down Expand Up @@ -149,6 +153,73 @@ if (ENABLE_SIMD_OPTIMIZATIONS)
endif()
endif()

#
# Create zlib.def.cmakein
#
if(NOT ZLIB_DEF_WRITTEN)
file(STRINGS "${zlib_SOURCE_DIR}/win32/zlib.def" ZLIB_DEF_LINES)

set(ZLIB_DEF_OUT "")

foreach(line IN LISTS ZLIB_DEF_LINES)
if(line MATCHES "^;")
string(APPEND ZLIB_DEF_OUT "${line}\n")
elseif(line MATCHES "^(LIBRARY|EXPORTS|DESCRIPTION)")
string(APPEND ZLIB_DEF_OUT "${line}\n")
elseif(line MATCHES "^ *$")
string(APPEND ZLIB_DEF_OUT "\n")
elseif(line MATCHES "^ *[A-Za-z_][A-Za-z0-9_]*")
string(REGEX REPLACE "^ +" "" sym "${line}")
string(APPEND ZLIB_DEF_OUT
" @ZLIB_PREFIX@${sym}\n")
else()
string(APPEND ZLIB_DEF_OUT "${line}\n")
endif()
endforeach()

file(WRITE
"${CMAKE_CURRENT_BINARY_DIR}/zlib.def.cmakein"
"${ZLIB_DEF_OUT}"
)

set(ZLIB_DEF_WRITTEN
TRUE
CACHE BOOL "zlib.def.cmakein was created")
mark_as_advanced(ZLIB_DEF_WRITTEN)
endif(NOT ZLIB_DEF_WRITTEN)

#
#Create zlib.map
#
if(NOT ZLIB_MAP_WRITTEN)
file(STRINGS "${zlib_SOURCE_DIR}/zlib.map" ZLIB_MAP_CONTENT)
set(ZLIB_MAP_OUT "")

foreach(line IN LISTS ZLIB_MAP_CONTENT)
if(line MATCHES "^ *[A-Za-z_][A-Za-z0-9_]* *; *$")
if(line MATCHES "^ *\\* *; *$")
string(APPEND ZLIB_MAP_OUT "${line}\n")
else()
string(REGEX REPLACE "^ +" "" sym "${line}")
string(APPEND ZLIB_MAP_OUT
" @ZLIB_PREFIX@${sym}\n")
endif()
else()
string(APPEND ZLIB_MAP_OUT "${line}\n")
endif()
endforeach()

file(WRITE
"${zlib_BINARY_DIR}/zlib.map.cmakein"
"${ZLIB_MAP_OUT}"
)

set(ZLIB_MAP_WRITTEN
TRUE
CACHE BOOL "zlib.map.cmakein was created")
mark_as_advanced(ZLIB_MAP_WRITTEN)
endif(NOT ZLIB_MAP_WRITTEN)

#
# Check to see if we have large file support
#
Expand All @@ -159,7 +230,7 @@ unset(CMAKE_REQUIRED_DEFINITIONS) # clear variable
#
# Check for fseeko
#
check_function_exists(fseeko HAVE_FSEEKO)
check_symbol_exists(fseeko stdio.h HAVE_FSEEKO)

#
# Check for stdarg.h
Expand Down Expand Up @@ -190,8 +261,21 @@ check_c_source_compiles(

unset(CMAKE_COMPILE_FLAGS)
set(ZLIB_PC ${zlib_BINARY_DIR}/zlib.pc)
if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
set(pc_includedir "${CMAKE_INSTALL_INCLUDEDIR}")
else()
set(pc_includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
endif()
if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
set(pc_libdir "${CMAKE_INSTALL_LIBDIR}")
else()
set(pc_libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
endif()

configure_file(${zlib_SOURCE_DIR}/zlib.pc.cmakein ${ZLIB_PC} @ONLY)
configure_file(${zlib_BINARY_DIR}/zconf.h.cmakein ${zlib_BINARY_DIR}/zconf.h)
configure_file(${zlib_BINARY_DIR}/zlib.def.cmakein ${zlib_BINARY_DIR}/zlib.def)
configure_file(${zlib_BINARY_DIR}/zlib.map.cmakein ${zlib_BINARY_DIR}/zlib.map)

# ============================================================================
# zlib
Expand Down Expand Up @@ -293,9 +377,12 @@ endif()

if(ZLIB_BUILD_SHARED)
add_library(
zlib SHARED ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}
$<$<OR:$<BOOL:${WIN32}>,$<BOOL:${CYGWIN}>>:win32/zlib1.rc>)
zlib SHARED ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS}
${ZLIB_PRIVATE_HDRS}
$<$<OR:$<BOOL:${WIN32}>,$<BOOL:${CYGWIN}>>:win32/zlib-cmake.rc>
$<$<BOOL:${MSVC}>:${zlib_BINARY_DIR}/zlib.def>)
add_library(ZLIB::ZLIB ALIAS zlib)

target_include_directories(
zlib
PUBLIC $<BUILD_INTERFACE:${zlib_BINARY_DIR}>
Expand All @@ -304,37 +391,48 @@ if(ZLIB_BUILD_SHARED)
target_compile_definitions(
zlib
PRIVATE ZLIB_BUILD
$<$<BOOL:NOT:${HAVE_FSEEKO}>:NO_FSEEKO>
$<$<NOT:$<BOOL:${HAVE_FSEEKO}>>:NO_FSEEKO>
$<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>
$<$<BOOL:${MSVC}>:_CRT_SECURE_NO_DEPRECATE>
$<$<BOOL:${MSVC}>:_CRT_NONSTDC_NO_DEPRECATE>
PUBLIC $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1>)
PUBLIC $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1>
$<$<BOOL:${ZLIB_PREFIX}>:Z_PREFIX=${ZLIB_PREFIX}>)

set(INSTALL_VERSION ${zlib_VERSION})

if(NOT CYGWIN)
if(CYGWIN)
set_target_properties(zlib PROPERTIES PREFIX "lib")
else(CYGWIN)
set_target_properties(zlib PROPERTIES SOVERSION ${zlib_VERSION_MAJOR}
VERSION ${INSTALL_VERSION})
endif(NOT CYGWIN)
endif(CYGWIN)

set_target_properties(zlib
PROPERTIES
DEFINE_SYMBOL ZLIB_DLL
EXPORT_NAME ZLIB
PUBLIC_HEADER "${ZLIB_PUBLIC_HDRS}")

if(MSVC)
set_target_properties(zlib PROPERTIES OUTPUT_NAME libz)
else(MSVC)
set_target_properties(zlib PROPERTIES OUTPUT_NAME z)
endif(MSVC)

set_target_properties(
zlib
PROPERTIES DEFINE_SYMBOL ZLIB_DLL
EXPORT_NAME ZLIB
OUTPUT_NAME z)
if(UNIX
AND NOT APPLE
AND NOT (CMAKE_SYSTEM_NAME STREQUAL AIX)
AND NOT (CMAKE_SYSTEM_NAME STREQUAL SunOS))
AND NOT (CMAKE_SYSTEM_NAME STREQUAL "AIX")
AND NOT (CMAKE_SYSTEM_NAME STREQUAL "SunOS"))
# On unix-like platforms the library is almost always called libz
set_target_properties(
zlib
PROPERTIES LINK_FLAGS
"-Wl,--version-script,\"${zlib_SOURCE_DIR}/zlib.map\"")
"-Wl,--version-script,\"${zlib_BINARY_DIR}/zlib.map\"")
endif(
UNIX
AND NOT APPLE
AND NOT (CMAKE_SYSTEM_NAME STREQUAL AIX)
AND NOT (CMAKE_SYSTEM_NAME STREQUAL SunOS))
AND NOT (CMAKE_SYSTEM_NAME STREQUAL "AIX")
AND NOT (CMAKE_SYSTEM_NAME STREQUAL "SunOS"))
endif(ZLIB_BUILD_SHARED)

if(ZLIB_BUILD_STATIC)
Expand All @@ -349,14 +447,31 @@ if(ZLIB_BUILD_STATIC)
target_compile_definitions(
zlibstatic
PRIVATE ZLIB_BUILD
$<$<BOOL:NOT:${HAVE_FSEEKO}>:NO_FSEEKO>
$<$<NOT:$<BOOL:${HAVE_FSEEKO}>>:NO_FSEEKO>
$<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>
$<$<BOOL:${MSVC}>:_CRT_SECURE_NO_DEPRECATE>
$<$<BOOL:${MSVC}>:_CRT_NONSTDC_NO_DEPRECATE>
PUBLIC $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1>)
set_target_properties(
zlibstatic PROPERTIES EXPORT_NAME ZLIBSTATIC OUTPUT_NAME
z${zlib_static_suffix})
PUBLIC $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1>
$<$<BOOL:${ZLIB_PREFIX}>:Z_PREFIX=${ZLIB_PREFIX}>)

if(CYGWIN)
set_target_properties(zlibstatic PROPERTIES PREFIX "lib")
endif(CYGWIN)

if(MSVC)
set_target_properties(zlibstatic
PROPERTIES
ARCHIVE_OUTPUT_NAME libz${zlib_static_suffix})
else(MSVC)
set_target_properties(zlibstatic
PROPERTIES
ARCHIVE_OUTPUT_NAME z${zlib_static_suffix})
endif(MSVC)

set_target_properties(zlibstatic
PROPERTIES
EXPORT_NAME ZLIBSTATIC
PUBLIC_HEADER "${ZLIB_PUBLIC_HDRS}")
endif(ZLIB_BUILD_STATIC)

if(ZLIB_INSTALL)
Expand All @@ -367,7 +482,10 @@ if(ZLIB_INSTALL)
EXPORT zlibSharedExport
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
PUBLIC_HEADER
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
COMPONENT Development)
install(
EXPORT zlibSharedExport
FILE ZLIB-shared.cmake
Expand All @@ -391,7 +509,8 @@ if(ZLIB_INSTALL)
EXPORT zlibStaticExport
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
install(
EXPORT zlibStaticExport
FILE ZLIB-static.cmake
Expand All @@ -412,10 +531,6 @@ if(ZLIB_INSTALL)
install(FILES ${zlib_BINARY_DIR}/ZLIBConfig.cmake
${zlib_BINARY_DIR}/ZLIBConfigVersion.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/zlib)
install(
FILES ${ZLIB_PUBLIC_HDRS}
COMPONENT Development
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
install(
FILES zlib.3
COMPONENT Docs
Expand Down
4 changes: 2 additions & 2 deletions deps/zlib/README
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ZLIB DATA COMPRESSION LIBRARY

zlib 1.3.2.1 is a general purpose data compression library. All the code is
zlib 1.4 is a general purpose data compression library. All the code is
thread safe (though see the FAQ for caveats). The data format used by the zlib
library is described by RFCs (Request for Comments) 1950 to 1952 at
https://datatracker.ietf.org/doc/html/rfc1950 (zlib format), rfc1951 (deflate
Expand Down Expand Up @@ -31,7 +31,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
issue of Dr. Dobb's Journal; a copy of the article is available at
https://zlib.net/nelson/ .

The changes made in version 1.3.2.1 are documented in the file ChangeLog.
The changes made in version 1.4 are documented in the file ChangeLog.

Unsupported third party contributions are provided in directory contrib/ .

Expand Down
8 changes: 4 additions & 4 deletions deps/zlib/README.chromium
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Name: zlib
Short Name: zlib
URL: https://github.com/madler/zlib
Version: 1.3.2
Revision: 09a1572aa624e5ddb6c075dc013880de70b1b9b9
Version: 1.4
Revision: 99623ef7097352da7993ba614161fd6a311e046e
Update Mechanism: Manual (https://crbug.com/422348588)
CPEPrefix: cpe:/a:zlib:zlib:1.3.2
CPEPrefix: cpe:/a:zlib:zlib:1.4
Security Critical: yes
Shipped: yes
License: Zlib
Expand All @@ -15,7 +15,7 @@ Description:
"A massively spiffy yet delicately unobtrusive compression library."

zlib is a free, general-purpose, legally unencumbered lossless data-compression
library. zlib implements the "deflate" compression algorithm described by RFC
library. zlib implements the "deflate" compression algorithm described by RFC
1951, which combines the LZ77 (Lempel-Ziv) algorithm with Huffman coding. zlib
also implements the zlib (RFC 1950) and gzip (RFC 1952) wrapper formats.

Expand Down
4 changes: 2 additions & 2 deletions deps/zlib/compress.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ int ZEXPORT compress2_z(Bytef *dest, z_size_t *destLen, const Bytef *source,
const uInt max = (uInt)-1;
z_size_t left;

if ((sourceLen > 0 && source == NULL) ||
destLen == NULL || (*destLen > 0 && dest == NULL))
if ((sourceLen > 0 && source == Z_NULL) ||
destLen == Z_NULL || (*destLen > 0 && dest == Z_NULL))
return Z_STREAM_ERROR;

left = *destLen;
Expand Down
Loading
Loading