ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10704 from Tilka/minizip 

CMake: rename minizip to minizip-ng
This commit is contained in:
Admiral H. Curtiss 2022-06-06 20:37:19 +02:00 committed by GitHub
parent 664663e8de 79a7bf02eb
commit 86fc13ff86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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})

2
Externals/minizip/CMakeLists.txt vendored
View File

@ -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)

2
Source/Core/Common/CMakeLists.txt
View File

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

2
Source/Core/Common/MinizipUtil.h
View File

@ -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"

2
Source/Core/DiscIO/CMakeLists.txt
View File

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

2
Source/Core/DiscIO/VolumeVerifier.cpp
View File

@ -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"

2
Source/Core/UICommon/CMakeLists.txt
View File

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

2
Source/Core/UICommon/ResourcePack/ResourcePack.cpp
View File

@ -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"