From 33f4dc41580c21d361232cb1be99e37443ef02df Mon Sep 17 00:00:00 2001 From: Benjamin Buch Date: Thu, 23 Oct 2025 19:17:29 +0200 Subject: [PATCH] rename cmake config target files to avoid illegal overwrite of PACKAGE_VERSION --- CMakeLists.txt | 4 ++-- zlib-config.cmake.in | 2 +- zlib-ng-config.cmake.in | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e995cc3..9f9bd2c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1518,7 +1518,7 @@ endif() if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) install(TARGETS ${ZLIB_INSTALL_LIBRARIES} - EXPORT ${EXPORT_NAME} + EXPORT ${EXPORT_NAME}-targets RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") @@ -1533,7 +1533,7 @@ if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL) endif() if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL) install(FILES ${ZLIB_PC} DESTINATION "${PKGCONFIG_INSTALL_DIR}") - install(EXPORT ${EXPORT_NAME} + install(EXPORT ${EXPORT_NAME}-targets DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${EXPORT_NAME}" NAMESPACE ${EXPORT_NAME}::) # Use GNU-style variable names diff --git a/zlib-config.cmake.in b/zlib-config.cmake.in index 2e4ba4f2..57868b1b 100644 --- a/zlib-config.cmake.in +++ b/zlib-config.cmake.in @@ -7,6 +7,6 @@ set(ZLIB_INCLUDE_DIRS "${ZLIB_INCLUDE_DIR}") set_and_check(ZLIB_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@") set(ZLIB_LIBRARIES ZLIB::ZLIB) -include("${CMAKE_CURRENT_LIST_DIR}/ZLIB.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/ZLIB-targets.cmake") check_required_components(ZLIB) diff --git a/zlib-ng-config.cmake.in b/zlib-ng-config.cmake.in index f7564a90..941a1e08 100644 --- a/zlib-ng-config.cmake.in +++ b/zlib-ng-config.cmake.in @@ -5,6 +5,6 @@ set(zlib-ng_VERSION @ZLIBNG_HEADER_VERSION@) set_and_check(zlib-ng_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") set_and_check(zlib-ng_LIB_DIR "@PACKAGE_LIB_INSTALL_DIR@") -include("${CMAKE_CURRENT_LIST_DIR}/zlib-ng.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/zlib-ng-targets.cmake") check_required_components(zlib-ng) -- 2.47.3