aboutsummaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorVollstrecker <werner@vollstreckernet.de>2025-02-18 08:47:58 +0100
committerMark Adler <madler@alumni.caltech.edu>2025-02-18 15:00:15 -0800
commit5a82f71ed1dfc0bec044d9702463dbdf84ea3b71 (patch)
tree973c98322bf8da6ce656bdd45500f3397615492e /CMakeLists.txt
parent7108497fda9d4536a1afade7f42266e06dca4488 (diff)
downloadzlib-develop.tar.gz
zlib-develop.tar.bz2
zlib-develop.zip
Use generated zconf.h in cmake build.HEADdevelop
This restores the inclusion of the local zconf.h (double quoted) in normal usage.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83f0ffd..aa73591 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -119,7 +119,6 @@ unset(CMAKE_COMPILE_FLAGS)
119set(ZLIB_PC ${zlib_BINARY_DIR}/zlib.pc) 119set(ZLIB_PC ${zlib_BINARY_DIR}/zlib.pc)
120configure_file(${zlib_SOURCE_DIR}/zlib.pc.cmakein ${ZLIB_PC} @ONLY) 120configure_file(${zlib_SOURCE_DIR}/zlib.pc.cmakein ${ZLIB_PC} @ONLY)
121configure_file(${zlib_BINARY_DIR}/zconf.h.cmakein ${zlib_BINARY_DIR}/zconf.h) 121configure_file(${zlib_BINARY_DIR}/zconf.h.cmakein ${zlib_BINARY_DIR}/zconf.h)
122include_directories(${zlib_BINARY_DIR} ${zlib_SOURCE_DIR})
123 122
124# ============================================================================ 123# ============================================================================
125# zlib 124# zlib
@@ -172,7 +171,8 @@ if(ZLIB_BUILD_SHARED)
172 $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) 171 $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
173 target_compile_definitions( 172 target_compile_definitions(
174 zlib 173 zlib
175 PRIVATE $<$<BOOL:NOT:${HAVE_FSEEKO}>:NO_FSEEKO> 174 PRIVATE ZLIB_BUILD
175 $<$<BOOL:NOT:${HAVE_FSEEKO}>:NO_FSEEKO>
176 $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN> 176 $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>
177 $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_DEPRECATE> 177 $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_DEPRECATE>
178 $<$<BOOL:${MSVC}>:_CRT_NONSTDC_NO_DEPRECATE> 178 $<$<BOOL:${MSVC}>:_CRT_NONSTDC_NO_DEPRECATE>
@@ -214,7 +214,8 @@ if(ZLIB_BUILD_STATIC)
214 $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) 214 $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
215 target_compile_definitions( 215 target_compile_definitions(
216 zlibstatic 216 zlibstatic
217 PRIVATE $<$<BOOL:NOT:${HAVE_FSEEKO}>:NO_FSEEKO> 217 PRIVATE ZLIB_BUILD
218 $<$<BOOL:NOT:${HAVE_FSEEKO}>:NO_FSEEKO>
218 $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN> 219 $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>
219 $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_DEPRECATE> 220 $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_DEPRECATE>
220 $<$<BOOL:${MSVC}>:_CRT_NONSTDC_NO_DEPRECATE> 221 $<$<BOOL:${MSVC}>:_CRT_NONSTDC_NO_DEPRECATE>