diff options
| author | Vollstrecker <github@vollstreckernet.de> | 2026-02-14 23:54:26 +0100 |
|---|---|---|
| committer | Mark Adler <git@madler.net> | 2026-02-16 01:57:40 -0800 |
| commit | 965fbb574f2d2117329ed7e48536cae1012ce672 (patch) | |
| tree | 74a15a988df555fc88e7a5f10d5570159583935c /CMakeLists.txt | |
| parent | f4f34491eaa63a6493098251971f5dd28819b133 (diff) | |
| download | zlib-965fbb574f2d2117329ed7e48536cae1012ce672.tar.gz zlib-965fbb574f2d2117329ed7e48536cae1012ce672.tar.bz2 zlib-965fbb574f2d2117329ed7e48536cae1012ce672.zip | |
CMake: Remove "compatible" zlib and minizip installations.
Replaced with zlib1-dll.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b31303e..71615168 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -27,10 +27,6 @@ option(ZLIB_PREFIX "prefix for all types and library functions, see zconf.h.in" | |||
| 27 | OFF) | 27 | OFF) |
| 28 | mark_as_advanced(ZLIB_PREFIX) | 28 | mark_as_advanced(ZLIB_PREFIX) |
| 29 | 29 | ||
| 30 | if(WIN32) | ||
| 31 | option(ZLIB_INSTALL_COMPAT_DLL "Install a copy as zlib1.dll" ON) | ||
| 32 | endif(WIN32) | ||
| 33 | |||
| 34 | get_property(IS_MULTI GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) | 30 | get_property(IS_MULTI GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) |
| 35 | 31 | ||
| 36 | if(NOT DEFINED CMAKE_BUILD_TYPE AND NOT IS_MULTI) | 32 | if(NOT DEFINED CMAKE_BUILD_TYPE AND NOT IS_MULTI) |
| @@ -240,13 +236,6 @@ if(ZLIB_INSTALL) | |||
| 240 | FILE ZLIB-shared.cmake | 236 | FILE ZLIB-shared.cmake |
| 241 | NAMESPACE ZLIB:: | 237 | NAMESPACE ZLIB:: |
| 242 | DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/zlib) | 238 | DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/zlib) |
| 243 | if(ZLIB_INSTALL_COMPAT_DLL) | ||
| 244 | install( | ||
| 245 | FILES $<TARGET_FILE:zlib> | ||
| 246 | COMPONENT Development | ||
| 247 | RENAME zlib1.dll | ||
| 248 | DESTINATION "${CMAKE_INSTALL_BINDIR}") | ||
| 249 | endif(ZLIB_INSTALL_COMPAT_DLL) | ||
| 250 | 239 | ||
| 251 | if(MSVC) | 240 | if(MSVC) |
| 252 | install( | 241 | install( |
| @@ -271,14 +260,6 @@ if(ZLIB_INSTALL) | |||
| 271 | FILE ZLIB-static.cmake | 260 | FILE ZLIB-static.cmake |
| 272 | NAMESPACE ZLIB:: | 261 | NAMESPACE ZLIB:: |
| 273 | DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/zlib) | 262 | DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/zlib) |
| 274 | |||
| 275 | if(ZLIB_INSTALL_COMPAT_DLL AND MINGW) | ||
| 276 | install( | ||
| 277 | FILES $<TARGET_FILE:zlibstatic> | ||
| 278 | COMPONENT Development | ||
| 279 | RENAME libz.dll.a | ||
| 280 | DESTINATION "${CMAKE_INSTALL_LIBDIR}") | ||
| 281 | endif(ZLIB_INSTALL_COMPAT_DLL AND MINGW) | ||
| 282 | endif(ZLIB_BUILD_STATIC) | 263 | endif(ZLIB_BUILD_STATIC) |
| 283 | 264 | ||
| 284 | configure_package_config_file( | 265 | configure_package_config_file( |
