Skip to content

Commit 61a56bc

Browse files
Vollstreckermadler
authored andcommitted
CMake: Make USE_FILE32API part of the interface.
1 parent 4891d81 commit 61a56bc

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

contrib/minizip/CMakeLists.txt

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ if(MINIZIP_BUILD_SHARED)
131131
PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
132132
$<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>
133133
$<$<BOOL:${HAVE_UNISTD_H}>:HAVE_UNISTD_H=1>
134-
$<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>
135134
PUBLIC $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1>
136-
$<$<BOOL:${BZIP2_FOUND}>:HAVE_BZIP2=1>)
135+
$<$<BOOL:${BZIP2_FOUND}>:HAVE_BZIP2=1>
136+
$<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
137137

138138
if(NOT CYGWIN)
139139
set_target_properties(libminizip PROPERTIES SOVERSION
@@ -154,14 +154,12 @@ if(MINIZIP_BUILD_SHARED)
154154
add_executable(minizip ${MINIZIP_SRCS} ${MINIZIP_HDRS})
155155
set_target_properties(minizip PROPERTIES EXPORT_NAME minizip_executable)
156156
target_compile_definitions(
157-
minizip PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
158-
$<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
157+
minizip PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>)
159158
target_link_libraries(minizip PRIVATE MINIZIP::minizip)
160159
add_executable(miniunzip ${MINIUNZIP_SRCS} ${MINIUNZIP_HDRS})
161160
set_target_properties(miniunzip PROPERTIES EXPORT_NAME miniunzip_executable)
162161
target_compile_definitions(
163-
miniunzip PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
164-
$<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
162+
miniunzip PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>)
165163
target_link_libraries(miniunzip PRIVATE MINIZIP::minizip)
166164
endif(MINIZIP_BUILD_SHARED)
167165

@@ -177,9 +175,9 @@ if(MINIZIP_BUILD_STATIC)
177175
PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
178176
$<$<BOOL:${HAVE___ATTR__VIS_HIDDEN}>:HAVE_HIDDEN>
179177
$<$<BOOL:${HAVE_UNISTD_H}>:HAVE_UNISTD_H=1>
180-
$<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>
181178
PUBLIC $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1>
182-
$<$<BOOL:${BZIP2_FOUND}>:HAVE_BZIP2=1>)
179+
$<$<BOOL:${BZIP2_FOUND}>:HAVE_BZIP2=1>
180+
$<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
183181
set_target_properties(
184182
libminizipstatic PROPERTIES EXPORT_NAME minizipstatic
185183
OUTPUT_NAME minizip${minizip_static_suffix})
@@ -195,15 +193,13 @@ if(MINIZIP_BUILD_STATIC)
195193
set_target_properties(minizipstatic PROPERTIES EXPORT_NAME
196194
minizip_static_executable)
197195
target_compile_definitions(
198-
minizipstatic PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
199-
$<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
196+
minizipstatic PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>)
200197
target_link_libraries(minizipstatic PRIVATE MINIZIP::minizipstatic)
201198
add_executable(miniunzipstatic ${MINIUNZIP_SRCS} ${MINIUNZIP_HDRS})
202199
set_target_properties(miniunzipstatic
203200
PROPERTIES EXPORT_NAME miniunzip_static_executable)
204201
target_compile_definitions(
205-
miniunzipstatic PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
206-
$<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
202+
miniunzipstatic PRIVATE $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>)
207203
target_link_libraries(miniunzipstatic PRIVATE MINIZIP::minizipstatic)
208204
endif(MINIZIP_BUILD_STATIC)
209205

0 commit comments

Comments
 (0)