Updated zlib and libaec compression versions (#4953)

CMakePresets.json

@@ -18,11 +18,11 @@
       "hidden": true,
       "cacheVariables": {
         "ZLIB_PACKAGE_NAME": {"type": "STRING", "value": "zlib"},
-        "ZLIB_TGZ_ORIGPATH": {"type": "STRING", "value": "https://github.com/madler/zlib/releases/download/v1.3"},
-        "ZLIB_TGZ_NAME": {"type": "STRING", "value": "zlib-1.3.tar.gz"},
+        "ZLIB_TGZ_ORIGPATH": {"type": "STRING", "value": "https://github.com/madler/zlib/releases/download/v1.3.1"},
+        "ZLIB_TGZ_NAME": {"type": "STRING", "value": "zlib-1.3.1.tar.gz"},
         "ZLIBNG_PACKAGE_NAME": {"type": "STRING", "value": "zlib-ng"},
         "ZLIBNG_TGZ_ORIGPATH": {"type": "STRING", "value": "https://github.com/zlib-ng/zlib-ng/archive/refs/tags"},
-        "ZLIBNG_TGZ_NAME": {"type": "STRING", "value": "2.1.6.tar.gz"},
+        "ZLIBNG_TGZ_NAME": {"type": "STRING", "value": "2.2.2.tar.gz"},
         "LIBAEC_PACKAGE_NAME": {"type": "STRING", "value": "libaec"},
         "LIBAEC_TGZ_ORIGPATH": {"type": "STRING", "value": "https://github.com/MathisRosenhauer/libaec/releases/download/v1.1.3"},
         "LIBAEC_TGZ_NAME": {"type": "STRING", "value": "libaec-1.1.3.tar.gz"}

config/cmake/LIBAEC/CMakeLists.txt

@@ -151,7 +151,7 @@ target_include_directories (${LIBAEC_LIB_TARGET} PUBLIC
   "$<BUILD_INTERFACE:${LIBAEC_SOURCE_DIR}/include>"
   "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>"
   "$<INSTALL_INTERFACE:include>")
-if (CMAKE_C_COMPILER_ID MATCHES "IntelLLVM" OR CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
+if (CMAKE_C_COMPILER_ID MATCHES "IntelLLVM" OR (CMAKE_C_COMPILER_ID MATCHES "[Cc]lang" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 15.0))
   target_compile_options(${LIBAEC_LIB_TARGET} PRIVATE -Wno-deprecated-non-prototype)
 endif ()
 if (CMAKE_C_COMPILER_ID STREQUAL "GNU")

config/cmake/ZLIB/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.18)
 set (CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
 project (ZLIB C)
 
-set (VERSION "1.3")
+set(VERSION "1.3.1")
 
 #-----------------------------------------------------------------------------
 # Basic ZLIB stuff here
@@ -131,6 +131,7 @@ set_directory_properties (PROPERTIES INCLUDE_DIRECTORIES
 if (MSVC)
   set(CMAKE_DEBUG_POSTFIX "d")
   add_definitions (-D_BIND_TO_CURRENT_VCLIBS_VERSION=1)
+  add_definitions (-D_CRT_SECURE_NO_DEPRECATE)
   add_definitions (-D_CRT_SECURE_NO_WARNINGS)
   add_definitions (-D_CONSOLE)
   add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
@@ -191,7 +192,10 @@ set(ZLIB_SRCS
 )
 
 add_library(${ZLIB_LIB_TARGET} STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-target_include_directories(${ZLIB_LIB_TARGET} PRIVATE "${CMAKE_BINARY_DIR}")
+target_include_directories(${ZLIB_LIB_TARGET}
+    PRIVATE "${CMAKE_BINARY_DIR}"
+    PUBLIC "${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}"
+)
 if (MSVC AND CMAKE_CL_64)
   set_target_properties (${ZLIB_LIB_TARGET} PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
 endif ()