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:
parent
664663e8de
commit
79a7bf02eb
|
@ -753,7 +753,7 @@ else()
|
||||||
add_subdirectory(Externals/zlib)
|
add_subdirectory(Externals/zlib)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
pkg_check_modules(MINIZIP minizip>=2.0.0)
|
pkg_check_modules(MINIZIP minizip-ng>=3.0.0)
|
||||||
if(MINIZIP_FOUND)
|
if(MINIZIP_FOUND)
|
||||||
message(STATUS "Using shared minizip")
|
message(STATUS "Using shared minizip")
|
||||||
include_directories(${MINIZIP_INCLUDE_DIRS})
|
include_directories(${MINIZIP_INCLUDE_DIRS})
|
||||||
|
|
|
@ -67,4 +67,4 @@ endif()
|
||||||
|
|
||||||
target_link_libraries(minizip PUBLIC ZLIB::ZLIB)
|
target_link_libraries(minizip PUBLIC ZLIB::ZLIB)
|
||||||
|
|
||||||
add_library(MiniZip::minizip ALIAS minizip)
|
add_library(minizip-ng ALIAS minizip)
|
||||||
|
|
|
@ -140,7 +140,7 @@ PUBLIC
|
||||||
enet
|
enet
|
||||||
fmt::fmt
|
fmt::fmt
|
||||||
${MBEDTLS_LIBRARIES}
|
${MBEDTLS_LIBRARIES}
|
||||||
minizip
|
minizip-ng
|
||||||
|
|
||||||
PRIVATE
|
PRIVATE
|
||||||
${CURL_LIBRARIES}
|
${CURL_LIBRARIES}
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
#include <unzip.h>
|
#include <mz_compat.h>
|
||||||
|
|
||||||
#include "Common/CommonTypes.h"
|
#include "Common/CommonTypes.h"
|
||||||
#include "Common/ScopeGuard.h"
|
#include "Common/ScopeGuard.h"
|
||||||
|
|
|
@ -73,7 +73,7 @@ PUBLIC
|
||||||
|
|
||||||
PRIVATE
|
PRIVATE
|
||||||
fmt::fmt
|
fmt::fmt
|
||||||
minizip
|
minizip-ng
|
||||||
pugixml
|
pugixml
|
||||||
ZLIB::ZLIB
|
ZLIB::ZLIB
|
||||||
)
|
)
|
||||||
|
|
|
@ -14,8 +14,8 @@
|
||||||
|
|
||||||
#include <mbedtls/md5.h>
|
#include <mbedtls/md5.h>
|
||||||
#include <mbedtls/sha1.h>
|
#include <mbedtls/sha1.h>
|
||||||
|
#include <mz_compat.h>
|
||||||
#include <pugixml.hpp>
|
#include <pugixml.hpp>
|
||||||
#include <unzip.h>
|
|
||||||
|
|
||||||
#include "Common/Align.h"
|
#include "Common/Align.h"
|
||||||
#include "Common/Assert.h"
|
#include "Common/Assert.h"
|
||||||
|
|
|
@ -31,7 +31,7 @@ target_link_libraries(uicommon
|
||||||
PUBLIC
|
PUBLIC
|
||||||
common
|
common
|
||||||
cpp-optparse
|
cpp-optparse
|
||||||
minizip
|
minizip-ng
|
||||||
pugixml
|
pugixml
|
||||||
|
|
||||||
PRIVATE
|
PRIVATE
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
#include <unzip.h>
|
#include <mz_compat.h>
|
||||||
|
|
||||||
#include "Common/CommonPaths.h"
|
#include "Common/CommonPaths.h"
|
||||||
#include "Common/FileSearch.h"
|
#include "Common/FileSearch.h"
|
||||||
|
|
Loading…
Reference in New Issue