CMake: Remove "compatible" zlib and minizip installations.

Replaced with zlib1-dll.

3 files changed, 1 insertions, 35 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"
        OFF)
 mark_as_advanced(ZLIB_PREFIX)
 
-if(WIN32)
-    option(ZLIB_INSTALL_COMPAT_DLL "Install a copy as zlib1.dll" ON)
-endif(WIN32)
-
 get_property(IS_MULTI GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 
 if(NOT DEFINED CMAKE_BUILD_TYPE AND NOT IS_MULTI)
@@ -240,13 +236,6 @@ if(ZLIB_INSTALL)
             FILE ZLIB-shared.cmake
             NAMESPACE ZLIB::
             DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/zlib)
-        if(ZLIB_INSTALL_COMPAT_DLL)
-            install(
-                FILES $<TARGET_FILE:zlib>
-                COMPONENT Development
-                RENAME zlib1.dll
-                DESTINATION "${CMAKE_INSTALL_BINDIR}")
-        endif(ZLIB_INSTALL_COMPAT_DLL)
 
         if(MSVC)
             install(
@@ -271,14 +260,6 @@ if(ZLIB_INSTALL)
             FILE ZLIB-static.cmake
             NAMESPACE ZLIB::
             DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/zlib)
-
-        if(ZLIB_INSTALL_COMPAT_DLL AND MINGW)
-            install(
-                FILES $<TARGET_FILE:zlibstatic>
-                COMPONENT Development
-                RENAME libz.dll.a
-                DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-        endif(ZLIB_INSTALL_COMPAT_DLL AND MINGW)
     endif(ZLIB_BUILD_STATIC)
 
     configure_package_config_file(
diff --git a/README-cmake.md b/README-cmake.md
index c81c242c..5f276415 100644
--- a/README-cmake.md
+++ b/README-cmake.md
@@ -25,8 +25,6 @@ If this option is turned on, additional options are available from minizip (see
 
     ZLIB_PREFIX=OFF -- prefix for all types and library functions, see zconf.h.in
 
-    ZLIB_INSTALL_COMPAT_DLL=ON -- Install a copy as zlib1.dll
-
 This option is only on windows available and may/will be turned off and removed somewhen in the future.
 If you rely cmake for finding and using zlib, this can be turned off, as `zlib1.dll` will never be used.
 
@@ -44,8 +42,6 @@ A usable installation of bzip2 is needed or config will fail. Turn this option o
 
     MINIZIP_INSTALL=ON -- Enable installation of minizip
 
-    MINIZIP_INSTALL_COMPAT_DLL=ON -- Install a copy as libminizip-1.dll
-
 This option is only available on mingw as they tend to name this lib different. Maybe this will also be
 removed in the future as. If you rely cmake for finding and using zlib, this can be turned off, as
 the other file will never be used.
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)
 option(MINIZIP_BUILD_SHARED "Enable building minizip shared library" ON)
 option(MINIZIP_BUILD_STATIC "Enable building minizip static library" ON)
 option(MINIZIP_BUILD_TESTING "Enable testing of minizip" ON)
-option(MINIZIP_ENABLE_BZIP2 "Build minizip withj bzip2 support" ON)
+option(MINIZIP_ENABLE_BZIP2 "Build minizip with bzip2 support" ON)
 option(MINIZIP_INSTALL "Enable installation of minizip" ON)
 
-if(MINGW)
-    option(MINIZIP_INSTALL_COMPAT_DLL "Install a copy as libminizip-1.dll" ON)
-endif(MINGW)
-
 include(CheckCSourceCompiles)
 include(CheckFunctionExists)
 include(CheckIncludeFile)
@@ -235,13 +231,6 @@ if(MINIZIP_INSTALL)
             FILE minizip-shared.cmake
             NAMESPACE MINIZIP::
             DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/minizip)
-        if(MINIZIP_INSTALL_COMPAT_DLL)
-            install(
-                FILES $<TARGET_FILE:libminizip>
-                COMPONENT Runtime
-                RENAME libminizip-${minizip_VERSION_MAJOR}.dll
-                DESTINATION "${CMAKE_INSTALL_BINDIR}")
-        endif(MINIZIP_INSTALL_COMPAT_DLL)
 
         if(MSVC)
             install(