aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt19
-rw-r--r--README-cmake.md4
-rw-r--r--contrib/minizip/CMakeLists.txt13
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"
27 OFF) 27 OFF)
28mark_as_advanced(ZLIB_PREFIX) 28mark_as_advanced(ZLIB_PREFIX)
29 29
30if(WIN32)
31 option(ZLIB_INSTALL_COMPAT_DLL "Install a copy as zlib1.dll" ON)
32endif(WIN32)
33
34get_property(IS_MULTI GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) 30get_property(IS_MULTI GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
35 31
36if(NOT DEFINED CMAKE_BUILD_TYPE AND NOT IS_MULTI) 32if(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(
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
25 25
26 ZLIB_PREFIX=OFF -- prefix for all types and library functions, see zconf.h.in 26 ZLIB_PREFIX=OFF -- prefix for all types and library functions, see zconf.h.in
27 27
28 ZLIB_INSTALL_COMPAT_DLL=ON -- Install a copy as zlib1.dll
29
30This option is only on windows available and may/will be turned off and removed somewhen in the future. 28This option is only on windows available and may/will be turned off and removed somewhen in the future.
31If you rely cmake for finding and using zlib, this can be turned off, as `zlib1.dll` will never be used. 29If you rely cmake for finding and using zlib, this can be turned off, as `zlib1.dll` will never be used.
32 30
@@ -44,8 +42,6 @@ A usable installation of bzip2 is needed or config will fail. Turn this option o
44 42
45 MINIZIP_INSTALL=ON -- Enable installation of minizip 43 MINIZIP_INSTALL=ON -- Enable installation of minizip
46 44
47 MINIZIP_INSTALL_COMPAT_DLL=ON -- Install a copy as libminizip-1.dll
48
49This option is only available on mingw as they tend to name this lib different. Maybe this will also be 45This option is only available on mingw as they tend to name this lib different. Maybe this will also be
50removed in the future as. If you rely cmake for finding and using zlib, this can be turned off, as 46removed in the future as. If you rely cmake for finding and using zlib, this can be turned off, as
51the other file will never be used. 47the 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)
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(