Commit 160de9b for zlib
commit 160de9bf5f4e115ecf9f6ff1802cffb5e86481d6
Author: Vollstrecker <werner@vollstreckernet.de>
Date: Sat Feb 28 15:38:28 2026 +0100
CMake: Fix DLL details when building with cmake.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76c0f8a..0e092a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -167,8 +167,9 @@ endif(WIN32)
if(ZLIB_BUILD_SHARED)
add_library(
zlib SHARED ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}
- $<$<OR:$<BOOL:${WIN32}>,$<BOOL:${CYGWIN}>>:win32/zlib1.rc>)
+ $<$<OR:$<BOOL:${WIN32}>,$<BOOL:${CYGWIN}>>:win32/zlib-cmake.rc>)
add_library(ZLIB::ZLIB ALIAS zlib)
+
target_include_directories(
zlib
PUBLIC $<BUILD_INTERFACE:${zlib_BINARY_DIR}>
diff --git a/contrib/zlib1-dll/CMakeLists.txt b/contrib/zlib1-dll/CMakeLists.txt
index 54f481e..caf6373 100644
--- a/contrib/zlib1-dll/CMakeLists.txt
+++ b/contrib/zlib1-dll/CMakeLists.txt
@@ -164,7 +164,6 @@ set(ZLIB1-DLL_SRCS
../../inffast.c
../../trees.c
../../uncompr.c
- ../../win32/zlib1.rc
../../zutil.c
../minizip/ioapi.c
../minizip/mztools.c
@@ -176,9 +175,11 @@ cmake_path(SET p2 "../../")
cmake_path(ABSOLUTE_PATH "p1" OUTPUT_VARIABLE DOTDOT)
cmake_path(ABSOLUTE_PATH "p2" OUTPUT_VARIABLE DOTMINIZIP)
-add_library(${ZLIB_CONTRIB_PREFIX}zlib1 SHARED ${ZLIB1-DLL_SRCS}
- ${ZLIB1-DLL_PUBLIC_HDRS}
- ${ZLIB1-DLL_PRIVATE_HDRS})
+add_library(${ZLIB_CONTRIB_PREFIX}zlib1 SHARED
+ ${ZLIB1-DLL_SRCS}
+ ${ZLIB1-DLL_PUBLIC_HDRS}
+ ${ZLIB1-DLL_PRIVATE_HDRS}
+ zlib1.rc)
add_library(ZLIB1DLL::ZLIB1DLL ALIAS ${ZLIB_CONTRIB_PREFIX}zlib1)
@@ -210,9 +211,11 @@ set_target_properties(${ZLIB_CONTRIB_PREFIX}zlib1 PROPERTIES
DEFINE_SYMBOL ZLIB_DLL
EXPORT_NAME ZLIB1DLL)
-add_library(${ZLIB_CONTRIB_PREFIX}zlibwapi SHARED ${ZLIB1-DLL_SRCS}
- ${ZLIB1-DLL_PUBLIC_HDRS}
- ${ZLIB1-DLL_PRIVATE_HDRS})
+add_library(${ZLIB_CONTRIB_PREFIX}zlibwapi SHARED
+ ${ZLIB1-DLL_SRCS}
+ ${ZLIB1-DLL_PUBLIC_HDRS}
+ ${ZLIB1-DLL_PRIVATE_HDRS}
+ zlibwapi.rc)
add_library(ZLIB1DLL::ZLIBWAPI ALIAS ${ZLIB_CONTRIB_PREFIX}zlibwapi)
diff --git a/contrib/zlib1-dll/zlib1.rc b/contrib/zlib1-dll/zlib1.rc
new file mode 100644
index 0000000..e16321d
--- /dev/null
+++ b/contrib/zlib1-dll/zlib1.rc
@@ -0,0 +1,45 @@
+#include <winver.h>
+#include "zlib.h"
+
+VS_VERSION_INFO VERSIONINFO
+
+ FILEVERSION ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
+ PRODUCTVERSION ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS 1
+#else
+ FILEFLAGS 0
+#endif
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0 // not used
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4"
+ //language ID = U.S. English, char set = Windows, Multilingual
+ BEGIN
+ VALUE "FileDescription", "zlib data compression library\0"
+ VALUE "FileVersion", ZLIB_VERSION "\0"
+#ifdef _DEBUG
+ VALUE "InternalName", "zlib1d.dll\0"
+#else
+ VALUE "InternalName", "zlib1.dll\0"
+#endif
+ VALUE "LegalCopyright", "(C) 1995-2026 Jean-loup Gailly & Mark Adler\0"
+#ifdef _DEBUG
+ VALUE "OriginalFilename", "zlib1d.dll\0"
+#else
+ VALUE "OriginalFilename", "zlib1.dll\0"
+#endif
+ VALUE "ProductName", "zlib\0"
+ VALUE "ProductVersion", ZLIB_VERSION "\0"
+ VALUE "Comments", "For more information visit https://www.zlib.net/\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0409, 1252
+ END
+END
diff --git a/contrib/zlib1-dll/zlibwapi.rc b/contrib/zlib1-dll/zlibwapi.rc
new file mode 100644
index 0000000..83b1fc7
--- /dev/null
+++ b/contrib/zlib1-dll/zlibwapi.rc
@@ -0,0 +1,45 @@
+#include <winver.h>
+#include "zlib.h"
+
+VS_VERSION_INFO VERSIONINFO
+
+ FILEVERSION ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
+ PRODUCTVERSION ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS 1
+#else
+ FILEFLAGS 0
+#endif
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0 // not used
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4"
+ //language ID = U.S. English, char set = Windows, Multilingual
+ BEGIN
+ VALUE "FileDescription", "zlib data compression library\0"
+ VALUE "FileVersion", ZLIB_VERSION "\0"
+#ifdef _DEBUG
+ VALUE "InternalName", "zlibwapid.dll\0"
+#else
+ VALUE "InternalName", "zlibwapi.dll\0"
+#endif
+ VALUE "LegalCopyright", "(C) 1995-2026 Jean-loup Gailly & Mark Adler\0"
+#ifdef _DEBUG
+ VALUE "OriginalFilename", "zlibwapid.dll\0"
+#else
+ VALUE "OriginalFilename", "zlibwapi.dll\0"
+#endif
+ VALUE "ProductName", "zlib\0"
+ VALUE "ProductVersion", ZLIB_VERSION "\0"
+ VALUE "Comments", "For more information visit https://www.zlib.net/\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0409, 1252
+ END
+END
diff --git a/win32/zlib-cmake.rc b/win32/zlib-cmake.rc
new file mode 100644
index 0000000..3f0fc23
--- /dev/null
+++ b/win32/zlib-cmake.rc
@@ -0,0 +1,45 @@
+#include <winver.h>
+#include "../zlib.h"
+
+VS_VERSION_INFO VERSIONINFO
+
+ FILEVERSION ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
+ PRODUCTVERSION ZLIB_VER_MAJOR,ZLIB_VER_MINOR,ZLIB_VER_REVISION,0
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+ FILEFLAGS 1
+#else
+ FILEFLAGS 0
+#endif
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0 // not used
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4"
+ //language ID = U.S. English, char set = Windows, Multilingual
+ BEGIN
+ VALUE "FileDescription", "zlib data compression library\0"
+ VALUE "FileVersion", ZLIB_VERSION "\0"
+#ifdef _DEBUG
+ VALUE "InternalName", "libzd.dll\0"
+#else
+ VALUE "InternalName", "libz.dll\0"
+#endif
+ VALUE "LegalCopyright", "(C) 1995-2026 Jean-loup Gailly & Mark Adler\0"
+#ifdef _DEBUG
+ VALUE "OriginalFilename", "libzd.dll\0"
+#else
+ VALUE "OriginalFilename", "libz.dll\0"
+#endif
+ VALUE "ProductName", "zlib\0"
+ VALUE "ProductVersion", ZLIB_VERSION "\0"
+ VALUE "Comments", "For more information visit https://www.zlib.net/\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0409, 1252
+ END
+END