Skip to content

Commit 5a82f71

Browse files
Vollstreckermadler
Vollstrecker
authored andcommitted
Use generated zconf.h in cmake build.
This restores the inclusion of the local zconf.h (double quoted) in normal usage.
1 parent 7108497 commit 5a82f71

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ unset(CMAKE_COMPILE_FLAGS)
119119
set(ZLIB_PC ${zlib_BINARY_DIR}/zlib.pc)
120120
configure_file(${zlib_SOURCE_DIR}/zlib.pc.cmakein ${ZLIB_PC} @ONLY)
121121
configure_file(${zlib_BINARY_DIR}/zconf.h.cmakein ${zlib_BINARY_DIR}/zconf.h)
122-
include_directories(${zlib_BINARY_DIR} ${zlib_SOURCE_DIR})
123122

124123
# ============================================================================
125124
# zlib
@@ -172,7 +171,8 @@ if(ZLIB_BUILD_SHARED)
172171
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
173172
target_compile_definitions(
174173
zlib
175-
PRIVATE $<$<BOOL:NOT:${HAVE_FSEEKO}>:NO_FSEEKO>
174+
PRIVATE ZLIB_BUILD
175+
$<$<BOOL:NOT:${HAVE_FSEEKO}>:NO_FSEEKO>
176176
$<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>
177177
$<$<BOOL:${MSVC}>:_CRT_SECURE_NO_DEPRECATE>
178178
$<$<BOOL:${MSVC}>:_CRT_NONSTDC_NO_DEPRECATE>
@@ -214,7 +214,8 @@ if(ZLIB_BUILD_STATIC)
214214
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
215215
target_compile_definitions(
216216
zlibstatic
217-
PRIVATE $<$<BOOL:NOT:${HAVE_FSEEKO}>:NO_FSEEKO>
217+
PRIVATE ZLIB_BUILD
218+
$<$<BOOL:NOT:${HAVE_FSEEKO}>:NO_FSEEKO>
218219
$<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>
219220
$<$<BOOL:${MSVC}>:_CRT_SECURE_NO_DEPRECATE>
220221
$<$<BOOL:${MSVC}>:_CRT_NONSTDC_NO_DEPRECATE>

test/CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ endfunction()
1616
if(ZLIB_BUILD_SHARED)
1717
add_executable(zlib_example example.c)
1818
target_link_libraries(zlib_example ZLIB::ZLIB)
19+
target_compile_definitions(zlib_example PRIVATE ZLIB_BUILD)
1920
add_test(NAME zlib_example COMMAND zlib_example)
2021

2122
add_executable(minigzip minigzip.c)
@@ -38,7 +39,7 @@ if(ZLIB_BUILD_SHARED)
3839
add_executable(zlib_example64 example.c)
3940
target_compile_definitions(
4041
zlib_example64
41-
PRIVATE LARGEFILE64_SOURCE=1
42+
PRIVATE ZLIB_BUILD
4243
$<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>)
4344
target_link_libraries(zlib_example64 ZLIB::ZLIB)
4445
add_test(NAME zlib_example64 COMMAND zlib_example64)
@@ -61,7 +62,8 @@ if(ZLIB_BUILD_STATIC)
6162
target_link_libraries(zlib_static_example ZLIB::ZLIBSTATIC)
6263
target_compile_definitions(
6364
zlib_static_example
64-
PRIVATE $<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>)
65+
PRIVATE ZLIB_BUILD
66+
$<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>)
6567
add_test(NAME zlib_static_example COMMAND zlib_static_example)
6668

6769
add_executable(static_minigzip minigzip.c)
@@ -116,7 +118,7 @@ if(ZLIB_BUILD_STATIC)
116118
add_executable(zlib_static_example64 example.c)
117119
target_compile_definitions(
118120
zlib_static_example64
119-
PRIVATE LARGEFILE64_SOURCE=1
121+
PRIVATE ZLIB_BUILD
120122
$<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>)
121123
target_link_libraries(zlib_static_example64 ZLIB::ZLIBSTATIC)
122124
add_test(NAME zlib_static_example64 COMMAND zlib_static_example64)

zlib.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@
3131
#ifndef ZLIB_H
3232
#define ZLIB_H
3333

34-
#include <zconf.h>
34+
#ifdef ZLIB_BUILD
35+
# include <zconf.h>
36+
#else
37+
# include "zconf.h"
38+
#endif
3539

3640
#ifdef __cplusplus
3741
extern "C" {

0 commit comments

Comments
 (0)