aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner <led-control@vollstreckernet.de>2024-12-15 20:07:20 +0100
committerMark Adler <madler@alumni.caltech.edu>2025-01-31 19:59:10 -0800
commitdfaf27b0c82706dbee8e7258473414f4525cc8cb (patch)
treeac8a2c3d082cae686bc753a7ada729f3576d1734
parent5f98365bc9035ca1028b75a9bc05c58009155598 (diff)
downloadzlib-dfaf27b0c82706dbee8e7258473414f4525cc8cb.tar.gz
zlib-dfaf27b0c82706dbee8e7258473414f4525cc8cb.tar.bz2
zlib-dfaf27b0c82706dbee8e7258473414f4525cc8cb.zip
CMake: Change to FindZLIB and ZLIB.cmake.
-rw-r--r--CMakeLists.txt10
-rw-r--r--contrib/minizip/CMakeLists.txt2
-rw-r--r--contrib/minizip/minizipConfig.cmake.in2
-rw-r--r--zlibConfig.cmake.in2
4 files changed, 8 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b777ad7..65aef14 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -252,22 +252,22 @@ if(ZLIB_INSTALL_LIBRARIES)
252 endif(ZLIB_BUILD_STATIC) 252 endif(ZLIB_BUILD_STATIC)
253 253
254 configure_package_config_file(${zlib_SOURCE_DIR}/zlibConfig.cmake.in 254 configure_package_config_file(${zlib_SOURCE_DIR}/zlibConfig.cmake.in
255 ${zlib_BINARY_DIR}/zlibConfig.cmake 255 ${zlib_BINARY_DIR}/ZLIBConfig.cmake
256 INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/zlib 256 INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/zlib
257 NO_CHECK_REQUIRED_COMPONENTS_MACRO) 257 NO_CHECK_REQUIRED_COMPONENTS_MACRO)
258 258
259 write_basic_package_version_file( 259 write_basic_package_version_file(
260 "${zlib_BINARY_DIR}/zlibConfigVersion.cmake" 260 "${zlib_BINARY_DIR}/ZLIBConfigVersion.cmake"
261 VERSION "${zlib_VERSION}" 261 VERSION "${zlib_VERSION}"
262 COMPATIBILITY AnyNewerVersion) 262 COMPATIBILITY AnyNewerVersion)
263 263
264 install(FILES 264 install(FILES
265 ${zlib_BINARY_DIR}/zlibConfig.cmake 265 ${zlib_BINARY_DIR}/ZLIBConfig.cmake
266 ${zlib_BINARY_DIR}/zlibConfigVersion.cmake 266 ${zlib_BINARY_DIR}/ZLIBConfigVersion.cmake
267 DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/zlib) 267 DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/zlib)
268 268
269 install(EXPORT zlibExport 269 install(EXPORT zlibExport
270 FILE zlib.cmake 270 FILE ZLIB.cmake
271 DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/zlib 271 DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/zlib
272 NAMESPACE ZLIB::) 272 NAMESPACE ZLIB::)
273 273
diff --git a/contrib/minizip/CMakeLists.txt b/contrib/minizip/CMakeLists.txt
index e433419..e599951 100644
--- a/contrib/minizip/CMakeLists.txt
+++ b/contrib/minizip/CMakeLists.txt
@@ -65,7 +65,7 @@ check_c_source_compiles(
65unset(CMAKE_REQUIRED_FLAGS) 65unset(CMAKE_REQUIRED_FLAGS)
66 66
67if(NOT TARGET ZLIB::ZLIB) 67if(NOT TARGET ZLIB::ZLIB)
68 find_package(zlib REQUIRED) 68 find_package(ZLIB REQUIRED)
69endif(NOT TARGET ZLIB::ZLIB) 69endif(NOT TARGET ZLIB::ZLIB)
70 70
71set(LIBMINIZIP_SRCS 71set(LIBMINIZIP_SRCS
diff --git a/contrib/minizip/minizipConfig.cmake.in b/contrib/minizip/minizipConfig.cmake.in
index 9c95fd6..6596c0d 100644
--- a/contrib/minizip/minizipConfig.cmake.in
+++ b/contrib/minizip/minizipConfig.cmake.in
@@ -2,5 +2,5 @@ set(minizip_VERSION @minizip_VERSION@)
2set(MINIZIP_ENABLE_BZIP2 @MINIZIP_ENABLE_BZIP2@) 2set(MINIZIP_ENABLE_BZIP2 @MINIZIP_ENABLE_BZIP2@)
3@PACKAGE_INIT@ 3@PACKAGE_INIT@
4include(CMakeFindDependencyMacro) 4include(CMakeFindDependencyMacro)
5find_dependency(zlib) 5find_dependency(ZLIB)
6INCLUDE (${CMAKE_CURRENT_LIST_DIR}/minizip.cmake) 6INCLUDE (${CMAKE_CURRENT_LIST_DIR}/minizip.cmake)
diff --git a/zlibConfig.cmake.in b/zlibConfig.cmake.in
index dfe6bba..8e64b6f 100644
--- a/zlibConfig.cmake.in
+++ b/zlibConfig.cmake.in
@@ -1,3 +1,3 @@
1set(zlib_VERSION @zlib_VERSION@) 1set(zlib_VERSION @zlib_VERSION@)
2@PACKAGE_INIT@ 2@PACKAGE_INIT@
3INCLUDE (${CMAKE_CURRENT_LIST_DIR}/zlib.cmake) 3INCLUDE (${CMAKE_CURRENT_LIST_DIR}/ZLIB.cmake)