Skip to content

Commit

Permalink
Update zlib to 1.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
halx99 committed Jan 31, 2024
1 parent a349647 commit e9382e4
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
11 changes: 6 additions & 5 deletions src/zlib/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
cmake_minimum_required(VERSION 2.4.4)
cmake_minimum_required(VERSION 2.4.4...3.15.0)
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)

project(zlib C)

set(VERSION "1.3")
set(VERSION "1.3.1.1")

option(ZLIB_BUILD_SHARED "Build zlib shared library" ON)
option(ZLIB_BUILD_STATIC "Build zlib static library" ON)
option(ZLIB_BUILD_EXAMPLES "Build zlib examples" ON)
option(ZLIB_BUILD_EXAMPLES "Enable Zlib Examples" ON)

set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
Expand Down Expand Up @@ -67,7 +67,8 @@ if(MSVC)
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
endif()

if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
option(RENAME_ZCONF "Rename the zconf when building out of source" ON)
if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR AND RENAME_ZCONF)
# If we're doing an out of source build and the user has a zconf.h
# in their source tree...
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)
Expand Down Expand Up @@ -206,7 +207,7 @@ endif()
#============================================================================
# Example binaries
#============================================================================
if (ZLIB_BUILD_EXAMPLES AND ZLIB_BUILD_SHARED)
if(ZLIB_BUILD_EXAMPLES)
add_executable(example test/example.c)
target_link_libraries(example zlib)
add_test(example example)
Expand Down
2 changes: 1 addition & 1 deletion src/zlib/build.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
repo: https://github.com/madler/zlib.git
ver: 1.3
ver: 1.3.1
tag_prefix: v
tag_dot2ul: false
cb_tool: cmake
Expand Down
2 changes: 1 addition & 1 deletion src/zlib/zconf.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* zconf.h -- configuration of the zlib compression library
* Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
* Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/

Expand Down

0 comments on commit e9382e4

Please sign in to comment.