Commit dd79f18 for zlib
commit dd79f1871be96755984077512e29a9ed53d95dbd
Author: Vollstrecker <werner@vollstreckernet.de>
Date: Wed May 6 13:28:32 2026 +0200
CMake: Fix installation of public headers.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 20732ce..43b000a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,10 +192,11 @@ if(ZLIB_BUILD_SHARED)
VERSION ${INSTALL_VERSION})
endif(CYGWIN)
- set_target_properties(
- zlib
- PROPERTIES DEFINE_SYMBOL ZLIB_DLL
- EXPORT_NAME ZLIB)
+ set_target_properties(zlib
+ PROPERTIES
+ DEFINE_SYMBOL ZLIB_DLL
+ EXPORT_NAME ZLIB
+ PUBLIC_HEADER "${ZLIB_PUBLIC_HDRS}")
if(MSVC)
set_target_properties(zlib PROPERTIES OUTPUT_NAME libz)
@@ -251,8 +252,10 @@ if(ZLIB_BUILD_STATIC)
ARCHIVE_OUTPUT_NAME z${zlib_static_suffix})
endif(MSVC)
- set_target_properties(
- zlibstatic PROPERTIES EXPORT_NAME ZLIBSTATIC)
+ set_target_properties(zlibstatic
+ PROPERTIES
+ EXPORT_NAME ZLIBSTATIC
+ PUBLIC_HEADER "${ZLIB_PUBLIC_HDRS}")
endif(ZLIB_BUILD_STATIC)
if(ZLIB_INSTALL)
@@ -263,7 +266,10 @@ if(ZLIB_INSTALL)
EXPORT zlibSharedExport
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ PUBLIC_HEADER
+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ COMPONENT Development)
install(
EXPORT zlibSharedExport
FILE ZLIB-shared.cmake
@@ -287,7 +293,8 @@ if(ZLIB_INSTALL)
EXPORT zlibStaticExport
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
install(
EXPORT zlibStaticExport
FILE ZLIB-static.cmake
@@ -308,10 +315,6 @@ if(ZLIB_INSTALL)
install(FILES ${zlib_BINARY_DIR}/ZLIBConfig.cmake
${zlib_BINARY_DIR}/ZLIBConfigVersion.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/zlib)
- install(
- FILES ${ZLIB_PUBLIC_HDRS}
- COMPONENT Development
- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
install(
FILES zlib.3
COMPONENT Docs
diff --git a/contrib/minizip/CMakeLists.txt b/contrib/minizip/CMakeLists.txt
index 1160694..c54a101 100644
--- a/contrib/minizip/CMakeLists.txt
+++ b/contrib/minizip/CMakeLists.txt
@@ -161,7 +161,8 @@ if(MINIZIP_BUILD_SHARED)
set_target_properties(${ZLIB_CONTRIB_PREFIX}libminizip
PROPERTIES
- EXPORT_NAME minizip)
+ EXPORT_NAME minizip
+ PUBLIC_HEADER "${LIBMINIZIP_HDRS}")
if(MSVC)
set_target_properties(${ZLIB_CONTRIB_PREFIX}libminizip
@@ -224,7 +225,8 @@ if(MINIZIP_BUILD_STATIC)
$<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
set_target_properties(${ZLIB_CONTRIB_PREFIX}libminizipstatic
PROPERTIES
- EXPORT_NAME minizipstatic)
+ EXPORT_NAME minizipstatic
+ PUBLIC_HEADER "${LIBMINIZIP_HDRS}")
if(CYGWIN)
set_target_properties(${ZLIB_CONTRIB_PREFIX}libminizipstatic
@@ -288,7 +290,10 @@ if(MINIZIP_INSTALL)
EXPORT minizipSharedExport
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ PUBLIC_HEADER
+ COMPONENT Development
+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/minizip")
install(
EXPORT minizipSharedExport
FILE minizip-shared.cmake
@@ -312,11 +317,13 @@ if(MINIZIP_INSTALL)
${ZLIB_CONTRIB_PREFIX}minizipstatic
${ZLIB_CONTRIB_PREFIX}miniunzipstatic
COMPONENT Development
- COMPONENT Runtime
EXPORT minizipStaticExport
- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+ RUNTIME
+ DESTINATION "${CMAKE_INSTALL_BINDIR}"
+ COMPONENT Runtime
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/minizip")
install(
EXPORT minizipStaticExport
FILE minizip-static.cmake
@@ -336,9 +343,7 @@ if(MINIZIP_INSTALL)
${minizip_BINARY_DIR}/minizipConfigVersion.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/minizip)
install(
- FILES ${LIBMINIZIP_HDRS}
COMPONENT Development
- DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
endif(MINIZIP_INSTALL)
if(MINIZIP_BUILD_TESTING)