Chiebot-Mirror
/
zlib
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

CMake: Rename exports of minizip.

Browse Source 
minizip-ng has prior art.
pull/1039/head
Werner 3 months ago committed by Mark Adler
parent 5ff476ee43
commit aefb4b5b94
2 changed files with 19 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      contrib/minizip/CMakeLists.txt
  2. 5
      contrib/minizip/minizipConfig.cmake.in

24
contrib/minizip/CMakeLists.txt
Unescape View File

@ -121,7 +121,7 @@ if(MINIZIP_BUILD_SHARED)
add_library(libminizip SHARED add_library(libminizip SHARED
${LIBMINIZIP_SRCS} ${LIBMINIZIP_SRCS}
${LIBMINIZIP_HDRS}) ${LIBMINIZIP_HDRS})
add_library(MINIZIP::MINIZIP ALIAS libminizip) add_library(MINIZIP::minizip ALIAS libminizip)
target_include_directories(libminizip PUBLIC target_include_directories(libminizip PUBLIC
$<BUILD_INTERFACE:${minizip_SOURCE_DIR}> $<BUILD_INTERFACE:${minizip_SOURCE_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
@ -141,7 +141,7 @@ if(MINIZIP_BUILD_SHARED)
endif(NOT CYGWIN) endif(NOT CYGWIN)
set_target_properties(libminizip PROPERTIES set_target_properties(libminizip PROPERTIES
EXPORT_NAME MINIZIP EXPORT_NAME minizip
OUTPUT_NAME minizip OUTPUT_NAME minizip
VERSIOM ${minizip_VERSION} VERSIOM ${minizip_VERSION}
SOVERSION ${minizip_VERSION_MAJOR}) SOVERSION ${minizip_VERSION_MAJOR})
@ -153,20 +153,24 @@ if(MINIZIP_BUILD_SHARED)
add_executable(minizip add_executable(minizip
${MINIZIP_SRCS} ${MINIZIP_SRCS}
${MINIZIP_HDRS}) ${MINIZIP_HDRS})
set_target_properties(minizip PROPERTIES
EXPORT_NAME minizip_executable)
target_compile_definitions(minizip target_compile_definitions(minizip
PRIVATE PRIVATE
$<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS> $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
$<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>) $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
target_link_libraries(minizip PRIVATE MINIZIP::MINIZIP) target_link_libraries(minizip PRIVATE MINIZIP::minizip)
add_executable(miniunzip add_executable(miniunzip
${MINIUNZIP_SRCS} ${MINIUNZIP_SRCS}
${MINIUNZIP_HDRS}) ${MINIUNZIP_HDRS})
set_target_properties(miniunzip PROPERTIES
EXPORT_NAME miniunzip_executable)
target_compile_definitions(miniunzip target_compile_definitions(miniunzip
PRIVATE PRIVATE
$<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS> $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
$<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>) $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
target_link_libraries(miniunzip PRIVATE MINIZIP::MINIZIP) target_link_libraries(miniunzip PRIVATE MINIZIP::minizip)
endif(MINIZIP_BUILD_SHARED) endif(MINIZIP_BUILD_SHARED)
if(MINIZIP_BUILD_STATIC) if(MINIZIP_BUILD_STATIC)
@ -174,7 +178,7 @@ if(MINIZIP_BUILD_STATIC)
add_library(libminizipstatic STATIC add_library(libminizipstatic STATIC
${LIBMINIZIP_SRCS} ${LIBMINIZIP_SRCS}
${LIBMINIZIP_HDRS}) ${LIBMINIZIP_HDRS})
add_library(MINIZIP::MINIZIPSTATIC ALIAS libminizipstatic) add_library(MINIZIP::minizipstatic ALIAS libminizipstatic)
target_include_directories(libminizipstatic PUBLIC target_include_directories(libminizipstatic PUBLIC
$<BUILD_INTERFACE:${minizip_SOURCE_DIR}> $<BUILD_INTERFACE:${minizip_SOURCE_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
@ -188,7 +192,7 @@ if(MINIZIP_BUILD_STATIC)
PUBLIC PUBLIC
$<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1>) $<$<BOOL:${HAVE_OFF64_T}>:_LARGEFILE64_SOURCE=1>)
set_target_properties(libminizipstatic PROPERTIES set_target_properties(libminizipstatic PROPERTIES
EXPORT_NAME MINIZIPSTATIC EXPORT_NAME minizipstatic
OUTPUT_NAME minizip${minizip_static_suffix}) OUTPUT_NAME minizip${minizip_static_suffix})
if(CYGWIN) if(CYGWIN)
@ -204,20 +208,24 @@ if(MINIZIP_BUILD_STATIC)
add_executable(minizipstatic add_executable(minizipstatic
${MINIZIP_SRCS} ${MINIZIP_SRCS}
${MINIZIP_HDRS}) ${MINIZIP_HDRS})
set_target_properties(minizipstatic PROPERTIES
EXPORT_NAME minizip_static_executable)
target_compile_definitions(minizipstatic target_compile_definitions(minizipstatic
PRIVATE PRIVATE
$<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS> $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
$<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>) $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
target_link_libraries(minizipstatic PRIVATE MINIZIP::MINIZIPSTATIC) target_link_libraries(minizipstatic PRIVATE MINIZIP::minizipstatic)
add_executable(miniunzipstatic add_executable(miniunzipstatic
${MINIUNZIP_SRCS} ${MINIUNZIP_SRCS}
${MINIUNZIP_HDRS}) ${MINIUNZIP_HDRS})
set_target_properties(miniunzipstatic PROPERTIES
EXPORT_NAME miniunzip_static_executable)
target_compile_definitions(miniunzipstatic target_compile_definitions(miniunzipstatic
PRIVATE PRIVATE
$<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS> $<$<BOOL:${MSVC}>:_CRT_SECURE_NO_WARNINGS>
$<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>) $<$<BOOL:NOT:${HAVE_FOPEN64}>:USE_FILE32API=1>)
target_link_libraries(miniunzipstatic PRIVATE MINIZIP::MINIZIPSTATIC) target_link_libraries(miniunzipstatic PRIVATE MINIZIP::minizipstatic)
endif(MINIZIP_BUILD_STATIC) endif(MINIZIP_BUILD_STATIC)
if(MINIZIP_INSTALL) if(MINIZIP_INSTALL)

5
contrib/minizip/minizipConfig.cmake.in
Unescape View File

@ -1,5 +1,6 @@
set(minizip_VERSION @minizip_VERSION@) set(minizip_VERSION @minizip_VERSION@)
set(MINIZIP_ENABLE_BZIP2 @MINIZIP_ENABLE_BZIP2@ set(MINIZIP_ENABLE_BZIP2 @MINIZIP_ENABLE_BZIP2@)
@PACKAGE_INIT@ @PACKAGE_INIT@
INCLUDE (${CMAKE_CURRENT_LIST_DIR}/minizip.cmake) include(CMakeFindDependencyMacro)
find_dependency(zlib) find_dependency(zlib)
INCLUDE (${CMAKE_CURRENT_LIST_DIR}/minizip.cmake)

Write Preview
Loading…
Cancel
Save