diff options
| author | Vollstrecker <werner@vollstreckernet.de> | 2026-01-03 10:53:14 +0100 |
|---|---|---|
| committer | Mark Adler <git@madler.net> | 2026-01-12 11:08:59 -0800 |
| commit | 39728a2b005fa549307943a3ed00afa878ab9a65 (patch) | |
| tree | 1aec587a98b62826c918351c682900abd9896058 | |
| parent | 53af7b07e530807daf6ddc55b479c19a128c3870 (diff) | |
| download | zlib-39728a2b005fa549307943a3ed00afa878ab9a65.tar.gz zlib-39728a2b005fa549307943a3ed00afa878ab9a65.tar.bz2 zlib-39728a2b005fa549307943a3ed00afa878ab9a65.zip | |
CMake: Add install and exports.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | contrib/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | contrib/blast/CMakeLists.txt | 63 | ||||
| -rw-r--r-- | contrib/iostream3/CMakeLists.txt | 61 | ||||
| -rw-r--r-- | contrib/puff/CMakeLists.txt | 61 |
5 files changed, 186 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e94f80..66dd728 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -241,7 +241,7 @@ if(ZLIB_INSTALL) | |||
| 241 | if(ZLIB_INSTALL_COMPAT_DLL) | 241 | if(ZLIB_INSTALL_COMPAT_DLL) |
| 242 | install( | 242 | install( |
| 243 | FILES $<TARGET_FILE:zlib> | 243 | FILES $<TARGET_FILE:zlib> |
| 244 | COMPONENT Runtime | 244 | COMPONENT Development |
| 245 | RENAME zlib1.dll | 245 | RENAME zlib1.dll |
| 246 | DESTINATION "${CMAKE_INSTALL_BINDIR}") | 246 | DESTINATION "${CMAKE_INSTALL_BINDIR}") |
| 247 | endif(ZLIB_INSTALL_COMPAT_DLL) | 247 | endif(ZLIB_INSTALL_COMPAT_DLL) |
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index fdaf2e9..8ec3bbd 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt | |||
| @@ -14,6 +14,11 @@ function(zlib_add_contrib_lib name description dir) | |||
| 14 | set(ZLIB_${name}_BUILD_TESTING ${ZLIB_BUILD_TESTING} CACHE BOOL "") | 14 | set(ZLIB_${name}_BUILD_TESTING ${ZLIB_BUILD_TESTING} CACHE BOOL "") |
| 15 | endif(NOT DEFINED ZLIB_${name}_BUILD_TESTING) | 15 | endif(NOT DEFINED ZLIB_${name}_BUILD_TESTING) |
| 16 | 16 | ||
| 17 | |||
| 18 | if(NOT DEFINED ZLIB_${name}_INSTALL) | ||
| 19 | set(ZLIB_${name}_INSTALL ${ZLIB_INSTALL} CACHE BOOL "") | ||
| 20 | endif(NOT DEFINED ZLIB_${name}_INSTALL) | ||
| 21 | |||
| 17 | add_subdirectory(${dir}/) | 22 | add_subdirectory(${dir}/) |
| 18 | endif(ZLIB_BUILD_${name}) | 23 | endif(ZLIB_BUILD_${name}) |
| 19 | endfunction(zlib_add_contrib_lib name description dir) | 24 | endfunction(zlib_add_contrib_lib name description dir) |
diff --git a/contrib/blast/CMakeLists.txt b/contrib/blast/CMakeLists.txt index 12c08a6..b1a9065 100644 --- a/contrib/blast/CMakeLists.txt +++ b/contrib/blast/CMakeLists.txt | |||
| @@ -1,7 +1,5 @@ | |||
| 1 | cmake_minimum_required(VERSION 3.12...3.31) | 1 | cmake_minimum_required(VERSION 3.12...3.31) |
| 2 | 2 | ||
| 3 | set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules") | ||
| 4 | |||
| 5 | project( | 3 | project( |
| 6 | blast | 4 | blast |
| 7 | VERSION 1.3.0 | 5 | VERSION 1.3.0 |
| @@ -12,9 +10,13 @@ project( | |||
| 12 | option(ZLIB_BLAST_BUILD_SHARED "Enable building blast shared library" ON) | 10 | option(ZLIB_BLAST_BUILD_SHARED "Enable building blast shared library" ON) |
| 13 | option(ZLIB_BLAST_BUILD_STATIC "Enable building blast static library" ON) | 11 | option(ZLIB_BLAST_BUILD_STATIC "Enable building blast static library" ON) |
| 14 | option(ZLIB_BLAST_BUILD_TESTING "Enable building tests for blast" ON) | 12 | option(ZLIB_BLAST_BUILD_TESTING "Enable building tests for blast" ON) |
| 13 | option(ZLIB_BLAST_INSTALL "Enable installation of blast" ON) | ||
| 14 | |||
| 15 | include(GNUInstallDirs) | ||
| 16 | include(CMakePackageConfigHelpers) | ||
| 15 | 17 | ||
| 16 | if(WIN32 OR CYGWIN) | 18 | if(WIN32 OR CYGWIN) |
| 17 | set(zlibAda_static_suffix "s") | 19 | set(zlibblast_static_suffix "s") |
| 18 | set(CMAKE_DEBUG_POSTFIX "d") | 20 | set(CMAKE_DEBUG_POSTFIX "d") |
| 19 | endif(WIN32 OR CYGWIN) | 21 | endif(WIN32 OR CYGWIN) |
| 20 | 22 | ||
| @@ -83,3 +85,58 @@ if(ZLIB_BLAST_BUILD_STATIC) | |||
| 83 | "${CMAKE_CURRENT_BINARY_DIR}") | 85 | "${CMAKE_CURRENT_BINARY_DIR}") |
| 84 | endif(ZLIB_BLAST_BUILD_TESTING) | 86 | endif(ZLIB_BLAST_BUILD_TESTING) |
| 85 | endif(ZLIB_BLAST_BUILD_STATIC) | 87 | endif(ZLIB_BLAST_BUILD_STATIC) |
| 88 | |||
| 89 | if(ZLIB_BLAST_INSTALL) | ||
| 90 | if(ZLIB_BLAST_BUILD_SHARED) | ||
| 91 | install( | ||
| 92 | TARGETS zlib_blast_blast | ||
| 93 | COMPONENT Runtime | ||
| 94 | EXPORT zlibBlastSharedExport | ||
| 95 | RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") | ||
| 96 | install( | ||
| 97 | EXPORT zlibBlastSharedExport | ||
| 98 | FILE blast-shared.cmake | ||
| 99 | NAMESPACE BLAST:: | ||
| 100 | DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/blast) | ||
| 101 | |||
| 102 | if(MSVC) | ||
| 103 | install( | ||
| 104 | FILES $<TARGET_PDB_FILE:zlib_blast_blast> | ||
| 105 | COMPONENT Development | ||
| 106 | DESTINATION ${CMAKE_INSTALL_BINDIR} | ||
| 107 | CONFIGURATIONS Debug OR RelWithDebInfo | ||
| 108 | OPTIONAL) | ||
| 109 | endif(MSVC) | ||
| 110 | endif(ZLIB_BLAST_BUILD_SHARED) | ||
| 111 | |||
| 112 | if(ZLIB_BLAST_BUILD_STATIC) | ||
| 113 | install( | ||
| 114 | TARGETS zlib_blast_blastStatic | ||
| 115 | COMPONENT Development | ||
| 116 | EXPORT zlibBlastStaticExport | ||
| 117 | ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") | ||
| 118 | install( | ||
| 119 | EXPORT zlibBlastStaticExport | ||
| 120 | FILE blast-static.cmake | ||
| 121 | NAMESPACE BLAST:: | ||
| 122 | DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/blast) | ||
| 123 | endif(ZLIB_BLAST_BUILD_STATIC) | ||
| 124 | |||
| 125 | configure_package_config_file( | ||
| 126 | ${blast_SOURCE_DIR}/blastConfig.cmake.in | ||
| 127 | ${blast_BINARY_DIR}/blastConfig.cmake | ||
| 128 | INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/blast) | ||
| 129 | |||
| 130 | write_basic_package_version_file( | ||
| 131 | "${blast_BINARY_DIR}/blastConfigVersion.cmake" | ||
| 132 | VERSION "${blast_VERSION}" | ||
| 133 | COMPATIBILITY AnyNewerVersion) | ||
| 134 | |||
| 135 | install(FILES ${blast_BINARY_DIR}/blastConfig.cmake | ||
| 136 | ${blast_BINARY_DIR}/blastConfigVersion.cmake | ||
| 137 | DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/blast) | ||
| 138 | install( | ||
| 139 | FILES blast.h | ||
| 140 | COMPONENT Development | ||
| 141 | DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") | ||
| 142 | endif(ZLIB_BLAST_INSTALL) | ||
diff --git a/contrib/iostream3/CMakeLists.txt b/contrib/iostream3/CMakeLists.txt index 3426a58..01bc279 100644 --- a/contrib/iostream3/CMakeLists.txt +++ b/contrib/iostream3/CMakeLists.txt | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | cmake_minimum_required(VERSION 3.12...3.31) | 1 | cmake_minimum_required(VERSION 3.12...3.31) |
| 2 | 2 | ||
| 3 | project( | 3 | project( |
| 4 | iostreamsV3 | 4 | iostreamV3 |
| 5 | VERSION 1.0.0 | 5 | VERSION 1.0.0 |
| 6 | LANGUAGES CXX | 6 | LANGUAGES CXX |
| 7 | DESCRIPTION "A library for using C++ IOStreams with zlib V3" | 7 | DESCRIPTION "A library for using C++ IOStreams with zlib V3" |
| @@ -10,6 +10,10 @@ project( | |||
| 10 | option(ZLIB_IOSTREAM3_BUILD_SHARED "Enable building blast shared library" ON) | 10 | option(ZLIB_IOSTREAM3_BUILD_SHARED "Enable building blast shared library" ON) |
| 11 | option(ZLIB_IOSTREAM3_BUILD_STATIC "Enable building blast static library" ON) | 11 | option(ZLIB_IOSTREAM3_BUILD_STATIC "Enable building blast static library" ON) |
| 12 | option(ZLIB_IOSTREAM3_BUILD_TESTING "Enable building tests for blast" ON) | 12 | option(ZLIB_IOSTREAM3_BUILD_TESTING "Enable building tests for blast" ON) |
| 13 | option(ZLIB_IOSTREAM3_INSTALL "Enable installation of iostream" ON) | ||
| 14 | |||
| 15 | include(GNUInstallDirs) | ||
| 16 | include(CMakePackageConfigHelpers) | ||
| 13 | 17 | ||
| 14 | if(NOT DEFINED ZLIB_BUILD_IOSTREAM3) | 18 | if(NOT DEFINED ZLIB_BUILD_IOSTREAM3) |
| 15 | if(ZLIB_IOSTREAM3_BUILD_SHARED) | 19 | if(ZLIB_IOSTREAM3_BUILD_SHARED) |
| @@ -88,3 +92,58 @@ if(ZLIB_IOSTREAM3_BUILD_TESTING) | |||
| 88 | PROPERTIES | 92 | PROPERTIES |
| 89 | FIXTURES_CLEANUP zlib_iostream3_cleanup) | 93 | FIXTURES_CLEANUP zlib_iostream3_cleanup) |
| 90 | endif(ZLIB_IOSTREAM3_BUILD_TESTING) | 94 | endif(ZLIB_IOSTREAM3_BUILD_TESTING) |
| 95 | |||
| 96 | if(ZLIB_IOSTREAM3_INSTALL) | ||
| 97 | if(ZLIB_IOSTREAM3_BUILD_SHARED) | ||
| 98 | install( | ||
| 99 | TARGETS zlib_iostream3_iostreamv3 | ||
| 100 | COMPONENT Runtime | ||
| 101 | EXPORT zlibiostream3SharedExport | ||
| 102 | RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") | ||
| 103 | install( | ||
| 104 | EXPORT zlibiostream3SharedExport | ||
| 105 | FILE iostreamv3-shared.cmake | ||
| 106 | NAMESPACE IOSTREAMV3:: | ||
| 107 | DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/iostreamv3) | ||
| 108 | |||
| 109 | if(MSVC) | ||
| 110 | install( | ||
| 111 | FILES $<TARGET_PDB_FILE:zlib_iostream3_iostream3> | ||
| 112 | COMPONENT Development | ||
| 113 | DESTINATION ${CMAKE_INSTALL_BINDIR} | ||
| 114 | CONFIGURATIONS Debug OR RelWithDebInfo | ||
| 115 | OPTIONAL) | ||
| 116 | endif(MSVC) | ||
| 117 | endif(ZLIB_IOSTREAM3_BUILD_SHARED) | ||
| 118 | |||
| 119 | if(ZLIB_IOSTREAM3_BUILD_STATIC) | ||
| 120 | install( | ||
| 121 | TARGETS zlib_iostream3_iostreamv3Static | ||
| 122 | COMPONENT Development | ||
| 123 | EXPORT iostream3StaticExport | ||
| 124 | ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") | ||
| 125 | install( | ||
| 126 | EXPORT iostream3StaticExport | ||
| 127 | FILE iostreamv3-static.cmake | ||
| 128 | NAMESPACE IOSTREAMV3:: | ||
| 129 | DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/iostreamv3) | ||
| 130 | endif(ZLIB_IOSTREAM3_BUILD_STATIC) | ||
| 131 | |||
| 132 | configure_package_config_file( | ||
| 133 | ${iostreamV3_SOURCE_DIR}/iostream3Config.cmake.in | ||
| 134 | ${iostreamV3_BINARY_DIR}/iostreamv3Config.cmake | ||
| 135 | INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/iostreamv3) | ||
| 136 | |||
| 137 | write_basic_package_version_file( | ||
| 138 | "${iostreamV3_BINARY_DIR}/iostreamv3ConfigVersion.cmake" | ||
| 139 | VERSION "${iostream3_VERSION}" | ||
| 140 | COMPATIBILITY AnyNewerVersion) | ||
| 141 | |||
| 142 | install(FILES ${iostreamV3_BINARY_DIR}/iostreamv3Config.cmake | ||
| 143 | ${iostreamV3_BINARY_DIR}/iostreamv3ConfigVersion.cmake | ||
| 144 | DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/iostreamv3) | ||
| 145 | install( | ||
| 146 | FILES zfstream.h | ||
| 147 | COMPONENT Development | ||
| 148 | DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") | ||
| 149 | endif(ZLIB_IOSTREAM3_INSTALL) | ||
diff --git a/contrib/puff/CMakeLists.txt b/contrib/puff/CMakeLists.txt index f7418fd..1696c76 100644 --- a/contrib/puff/CMakeLists.txt +++ b/contrib/puff/CMakeLists.txt | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | cmake_minimum_required(VERSION 3.12...3.31) | 1 | cmake_minimum_required(VERSION 3.12...3.31) |
| 2 | 2 | ||
| 3 | project( | 3 | project( |
| 4 | iostreamsV3 | 4 | puff |
| 5 | VERSION 1.0.0 | 5 | VERSION 1.0.0 |
| 6 | LANGUAGES C | 6 | LANGUAGES C |
| 7 | DESCRIPTION "A library for decompressing deflate with very little footprint" | 7 | DESCRIPTION "A library for decompressing deflate with very little footprint" |
| @@ -10,6 +10,10 @@ project( | |||
| 10 | option(ZLIB_PUFF_BUILD_SHARED "Enable building blast shared library" ON) | 10 | option(ZLIB_PUFF_BUILD_SHARED "Enable building blast shared library" ON) |
| 11 | option(ZLIB_PUFF_BUILD_STATIC "Enable building blast static library" ON) | 11 | option(ZLIB_PUFF_BUILD_STATIC "Enable building blast static library" ON) |
| 12 | option(ZLIB_PUFF_BUILD_TESTING "Enable building tests for blast" ON) | 12 | option(ZLIB_PUFF_BUILD_TESTING "Enable building tests for blast" ON) |
| 13 | option(ZLIB_PUFF_INSTALL "Enable installation of puff" ON) | ||
| 14 | |||
| 15 | include(GNUInstallDirs) | ||
| 16 | include(CMakePackageConfigHelpers) | ||
| 13 | 17 | ||
| 14 | if(NOT DEFINED ZLIB_BUILD_PUFF) | 18 | if(NOT DEFINED ZLIB_BUILD_PUFF) |
| 15 | if(ZLIB_PUFF_BUILD_SHARED) | 19 | if(ZLIB_PUFF_BUILD_SHARED) |
| @@ -135,3 +139,58 @@ if(ZLIB_PUFF_BUILD_STATIC) | |||
| 135 | endif(GCOV_EXECUTABLE) | 139 | endif(GCOV_EXECUTABLE) |
| 136 | endif(ZLIB_PUFF_BUILD_TESTING) | 140 | endif(ZLIB_PUFF_BUILD_TESTING) |
| 137 | endif(ZLIB_PUFF_BUILD_STATIC) | 141 | endif(ZLIB_PUFF_BUILD_STATIC) |
| 142 | |||
| 143 | if(ZLIB_PUFF_INSTALL) | ||
| 144 | if(ZLIB_PUFF_BUILD_SHARED) | ||
| 145 | install( | ||
| 146 | TARGETS zlib_puff_puff | ||
| 147 | COMPONENT Runtime | ||
| 148 | EXPORT puffSharedExport | ||
| 149 | RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") | ||
| 150 | install( | ||
| 151 | EXPORT puffSharedExport | ||
| 152 | FILE puff-shared.cmake | ||
| 153 | NAMESPACE PUFF:: | ||
| 154 | DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/puff) | ||
| 155 | |||
| 156 | if(MSVC) | ||
| 157 | install( | ||
| 158 | FILES $<TARGET_PDB_FILE:zlib_puff_puff> | ||
| 159 | COMPONENT Development | ||
| 160 | DESTINATION ${CMAKE_INSTALL_BINDIR} | ||
| 161 | CONFIGURATIONS Debug OR RelWithDebInfo | ||
| 162 | OPTIONAL) | ||
| 163 | endif(MSVC) | ||
| 164 | endif(ZLIB_PUFF_BUILD_SHARED) | ||
| 165 | |||
| 166 | if(ZLIB_PUFF_BUILD_STATIC) | ||
| 167 | install( | ||
| 168 | TARGETS zlib_puff_puffStatic | ||
| 169 | COMPONENT Development | ||
| 170 | EXPORT puffStaticExport | ||
| 171 | ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") | ||
| 172 | install( | ||
| 173 | EXPORT puffStaticExport | ||
| 174 | FILE puff-static.cmake | ||
| 175 | NAMESPACE PUFF:: | ||
| 176 | DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/puff) | ||
| 177 | endif(ZLIB_PUFF_BUILD_STATIC) | ||
| 178 | |||
| 179 | configure_package_config_file( | ||
| 180 | ${puff_SOURCE_DIR}/puffConfig.cmake.in | ||
| 181 | ${puff_BINARY_DIR}/puffConfig.cmake | ||
| 182 | INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/puff) | ||
| 183 | |||
| 184 | write_basic_package_version_file( | ||
| 185 | "${puff_BINARY_DIR}/puffConfigVersion.cmake" | ||
| 186 | VERSION "${puff_VERSION}" | ||
| 187 | COMPATIBILITY AnyNewerVersion) | ||
| 188 | |||
| 189 | install(FILES ${puff_BINARY_DIR}/puffConfig.cmake | ||
| 190 | ${puff_BINARY_DIR}/puffConfigVersion.cmake | ||
| 191 | DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/puff) | ||
| 192 | install( | ||
| 193 | FILES puff.h | ||
| 194 | COMPONENT Development | ||
| 195 | DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") | ||
| 196 | endif(ZLIB_PUFF_INSTALL) | ||
