From 0c9966df9836d79ba87ef5f372384616c3425c3b Mon Sep 17 00:00:00 2001 From: Jakub Marcowski Date: Tue, 9 Apr 2024 19:43:43 +0200 Subject: [PATCH] zlib: Update to 1.3.1 --- third_party/CMakeLists.txt | 5 ++++- third_party/zlib | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index e2b2f3335..01030d2ee 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -15,7 +15,7 @@ endif() if(NOT USE_SHARED_ZLIB) set(SKIP_INSTALL_ALL on) # Don't build zlib tests - set(ZLIB_TESTS OFF CACHE BOOL "Build zlib tests") + set(ZLIB_BUILD_EXAMPLES OFF CACHE BOOL "Enable Zlib Examples") add_subdirectory(zlib) endif() @@ -127,6 +127,9 @@ endif() add_subdirectory(json11) # libarchive +set(HAVE_WCSCPY 1) +set(HAVE_WCSLEN 1) + set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.") set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests") set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)") diff --git a/third_party/zlib b/third_party/zlib index fc3ecad5d..51b7f2abd 160000 --- a/third_party/zlib +++ b/third_party/zlib @@ -1 +1 @@ -Subproject commit fc3ecad5d50b59945ffd3f44c78472c3ecc70b87 +Subproject commit 51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf