diff options
Diffstat (limited to 'cmake/modules/FindMinizip.cmake')
| -rw-r--r-- | cmake/modules/FindMinizip.cmake | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/cmake/modules/FindMinizip.cmake b/cmake/modules/FindMinizip.cmake index b6d9c867..f85a06cd 100644 --- a/cmake/modules/FindMinizip.cmake +++ b/cmake/modules/FindMinizip.cmake @@ -7,7 +7,7 @@ # MINIZIP_DLL_DIR - (Windows) Path to the minizip DLL. # MINIZIP_DLL - (Windows) Name of the minizip DLL. -FindWSWinLibs( "minizip-*" "MINIZIP_HINTS" ) +FindWSWinLibs("minizip-[0-9]" "MINIZIP_HINTS") if(NOT USE_REPOSITORY) find_package(PkgConfig QUIET) @@ -44,7 +44,8 @@ find_package_handle_standard_args(Minizip if(MINIZIP_FOUND) set(MINIZIP_LIBRARIES ${MINIZIP_LIBRARY}) set(MINIZIP_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIR}) - SET(HAVE_MINIZIP ON) + set(HAVE_MINIZIP ON) + # Some distributions have minizip-ng code instead of the original zlib contrib # library but keep the old minizip name (because minizip-ng is # better maintained and provides a compatibility layer). However the @@ -52,29 +53,30 @@ if(MINIZIP_FOUND) # for renamed struct members to avoid an endless game of whack-a-mole. include(CheckStructHasMember) check_struct_has_member("zip_fileinfo" "dos_date" "minizip/zip.h" HAVE_MZCOMPAT_DOS_DATE) - if (WIN32) - set ( MINIZIP_DLL_DIR "${MINIZIP_HINTS}/bin" + + if(WIN32) + set(MINIZIP_DLL_DIR "${MINIZIP_HINTS}/bin" CACHE PATH "Path to Minizip DLL" ) - file( GLOB _minizip_dll RELATIVE "${MINIZIP_DLL_DIR}" + file(GLOB _minizip_dll RELATIVE "${MINIZIP_DLL_DIR}" "${MINIZIP_DLL_DIR}/minizip.dll" ) - set ( MINIZIP_DLL ${_minizip_dll} + set(MINIZIP_DLL ${_minizip_dll} CACHE FILEPATH "Minizip DLL file name" ) - file( GLOB _minizip_pdb RELATIVE "${MINIZIP_DLL_DIR}" + file(GLOB _minizip_pdb RELATIVE "${MINIZIP_DLL_DIR}" "${MINIZIP_DLL_DIR}/minizip.pdb" ) - set ( MINIZIP_PDB ${_minizip_pdb} + set(MINIZIP_PDB ${_minizip_pdb} CACHE FILEPATH "Minizip PDB file name" ) - mark_as_advanced( MINIZIP_DLL_DIR MINIZIP_DLL MINIZIP_PDB ) + mark_as_advanced(MINIZIP_DLL_DIR MINIZIP_DLL MINIZIP_PDB) endif() else() set(MINIZIP_LIBRARIES) set(MINIZIP_INCLUDE_DIRS) - SET( MINIZIP_DLL_DIR ) - SET( MINIZIP_DLL ) + set(MINIZIP_DLL_DIR) + set(MINIZIP_DLL) endif() mark_as_advanced(MINIZIP_LIBRARIES MINIZIP_INCLUDE_DIRS) |