CMake: rename minizip to minizip-ng

minizip-ng is the new name used by the upstream project as well as all
distros other than Fedora (but it looks like it will be renamed there).
This commit is contained in:
Tillmann Karras 2022-05-28 23:19:55 +01:00 committed by Admiral H. Curtiss
parent 664663e8de
commit 79a7bf02eb
No known key found for this signature in database
GPG Key ID: F051B4C4044F33FB
8 changed files with 8 additions and 8 deletions

View File

@ -753,7 +753,7 @@ else()
add_subdirectory(Externals/zlib)
endif()
pkg_check_modules(MINIZIP minizip>=2.0.0)
pkg_check_modules(MINIZIP minizip-ng>=3.0.0)
if(MINIZIP_FOUND)
message(STATUS "Using shared minizip")
include_directories(${MINIZIP_INCLUDE_DIRS})

View File

@ -67,4 +67,4 @@ endif()
target_link_libraries(minizip PUBLIC ZLIB::ZLIB)
add_library(MiniZip::minizip ALIAS minizip)
add_library(minizip-ng ALIAS minizip)

View File

@ -140,7 +140,7 @@ PUBLIC
enet
fmt::fmt
${MBEDTLS_LIBRARIES}
minizip
minizip-ng
PRIVATE
${CURL_LIBRARIES}

View File

@ -5,7 +5,7 @@
#include <algorithm>
#include <unzip.h>
#include <mz_compat.h>
#include "Common/CommonTypes.h"
#include "Common/ScopeGuard.h"

View File

@ -73,7 +73,7 @@ PUBLIC
PRIVATE
fmt::fmt
minizip
minizip-ng
pugixml
ZLIB::ZLIB
)

View File

@ -14,8 +14,8 @@
#include <mbedtls/md5.h>
#include <mbedtls/sha1.h>
#include <mz_compat.h>
#include <pugixml.hpp>
#include <unzip.h>
#include "Common/Align.h"
#include "Common/Assert.h"

View File

@ -31,7 +31,7 @@ target_link_libraries(uicommon
PUBLIC
common
cpp-optparse
minizip
minizip-ng
pugixml
PRIVATE

View File

@ -5,7 +5,7 @@
#include <algorithm>
#include <unzip.h>
#include <mz_compat.h>
#include "Common/CommonPaths.h"
#include "Common/FileSearch.h"