From dfaf27b0c82706dbee8e7258473414f4525cc8cb Mon Sep 17 00:00:00 2001 From: Werner Date: Sun, 15 Dec 2024 20:07:20 +0100 Subject: CMake: Change to FindZLIB and ZLIB.cmake. --- CMakeLists.txt | 10 +++++----- contrib/minizip/CMakeLists.txt | 2 +- contrib/minizip/minizipConfig.cmake.in | 2 +- zlibConfig.cmake.in | 2 +- 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) endif(ZLIB_BUILD_STATIC) configure_package_config_file(${zlib_SOURCE_DIR}/zlibConfig.cmake.in - ${zlib_BINARY_DIR}/zlibConfig.cmake + ${zlib_BINARY_DIR}/ZLIBConfig.cmake INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/zlib NO_CHECK_REQUIRED_COMPONENTS_MACRO) write_basic_package_version_file( - "${zlib_BINARY_DIR}/zlibConfigVersion.cmake" + "${zlib_BINARY_DIR}/ZLIBConfigVersion.cmake" VERSION "${zlib_VERSION}" COMPATIBILITY AnyNewerVersion) install(FILES - ${zlib_BINARY_DIR}/zlibConfig.cmake - ${zlib_BINARY_DIR}/zlibConfigVersion.cmake + ${zlib_BINARY_DIR}/ZLIBConfig.cmake + ${zlib_BINARY_DIR}/ZLIBConfigVersion.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/zlib) install(EXPORT zlibExport - FILE zlib.cmake + FILE ZLIB.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/zlib NAMESPACE ZLIB::) 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( unset(CMAKE_REQUIRED_FLAGS) if(NOT TARGET ZLIB::ZLIB) - find_package(zlib REQUIRED) + find_package(ZLIB REQUIRED) endif(NOT TARGET ZLIB::ZLIB) set(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@) set(MINIZIP_ENABLE_BZIP2 @MINIZIP_ENABLE_BZIP2@) @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(zlib) +find_dependency(ZLIB) INCLUDE (${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 @@ set(zlib_VERSION @zlib_VERSION@) @PACKAGE_INIT@ -INCLUDE (${CMAKE_CURRENT_LIST_DIR}/zlib.cmake) +INCLUDE (${CMAKE_CURRENT_LIST_DIR}/ZLIB.cmake) -- cgit v1.2.3-55-g6feb