aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorVollstrecker <github@vollstreckernet.de>2026-02-14 23:54:26 +0100
committerMark Adler <git@madler.net>2026-02-16 01:57:40 -0800
commit965fbb574f2d2117329ed7e48536cae1012ce672 (patch)
tree74a15a988df555fc88e7a5f10d5570159583935c /contrib
parentf4f34491eaa63a6493098251971f5dd28819b133 (diff)
downloadzlib-965fbb574f2d2117329ed7e48536cae1012ce672.tar.gz
zlib-965fbb574f2d2117329ed7e48536cae1012ce672.tar.bz2
zlib-965fbb574f2d2117329ed7e48536cae1012ce672.zip
CMake: Remove "compatible" zlib and minizip installations.
Replaced with zlib1-dll.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/minizip/CMakeLists.txt13
1 files changed, 1 insertions, 12 deletions
diff --git a/contrib/minizip/CMakeLists.txt b/contrib/minizip/CMakeLists.txt
index fe357df2..e394a6cf 100644
--- a/contrib/minizip/CMakeLists.txt
+++ b/contrib/minizip/CMakeLists.txt
@@ -36,13 +36,9 @@ endif(ZLIB_BUILD_MINIZIP)
36option(MINIZIP_BUILD_SHARED "Enable building minizip shared library" ON) 36option(MINIZIP_BUILD_SHARED "Enable building minizip shared library" ON)
37option(MINIZIP_BUILD_STATIC "Enable building minizip static library" ON) 37option(MINIZIP_BUILD_STATIC "Enable building minizip static library" ON)
38option(MINIZIP_BUILD_TESTING "Enable testing of minizip" ON) 38option(MINIZIP_BUILD_TESTING "Enable testing of minizip" ON)
39option(MINIZIP_ENABLE_BZIP2 "Build minizip withj bzip2 support" ON) 39option(MINIZIP_ENABLE_BZIP2 "Build minizip with bzip2 support" ON)
40option(MINIZIP_INSTALL "Enable installation of minizip" ON) 40option(MINIZIP_INSTALL "Enable installation of minizip" ON)
41 41
42if(MINGW)
43 option(MINIZIP_INSTALL_COMPAT_DLL "Install a copy as libminizip-1.dll" ON)
44endif(MINGW)
45
46include(CheckCSourceCompiles) 42include(CheckCSourceCompiles)
47include(CheckFunctionExists) 43include(CheckFunctionExists)
48include(CheckIncludeFile) 44include(CheckIncludeFile)
@@ -235,13 +231,6 @@ if(MINIZIP_INSTALL)
235 FILE minizip-shared.cmake 231 FILE minizip-shared.cmake
236 NAMESPACE MINIZIP:: 232 NAMESPACE MINIZIP::
237 DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/minizip) 233 DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/minizip)
238 if(MINIZIP_INSTALL_COMPAT_DLL)
239 install(
240 FILES $<TARGET_FILE:libminizip>
241 COMPONENT Runtime
242 RENAME libminizip-${minizip_VERSION_MAJOR}.dll
243 DESTINATION "${CMAKE_INSTALL_BINDIR}")
244 endif(MINIZIP_INSTALL_COMPAT_DLL)
245 234
246 if(MSVC) 235 if(MSVC)
247 install( 236 install(