From b06b816d4c29edd314e0611f4305af4c50a4c56f Mon Sep 17 00:00:00 2001 From: Reilly Brogan Date: Tue, 2 Jul 2024 12:43:42 -0500 Subject: [PATCH] cmake: Fix building with system minizip-ng Dolphin currently fails to build when the Linux system building it includes headers/pkgconfigs for minizip-ng built in both minizip-ng mode and legacy compat mode (the minizip API). This is because minizip-ng is checked for in cmake however the code is not actually compatible against minizip-ng built in non-legacy mode. Until that is rectified Dolphin should just check for a pkgconfig for minizip. If the system has a pkgconfig for minizip with a version >= 4 then the system package is minizip-ng built in compat mode which is exactly what we want. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5b246b193b..ce5d64715f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -677,7 +677,7 @@ dolphin_find_optional_system_library_pkgconfig(ZSTD libzstd>=1.4.0 zstd::zstd Ex dolphin_find_optional_system_library_pkgconfig(ZLIB zlib-ng ZLIB::ZLIB Externals/zlib-ng) dolphin_find_optional_system_library_pkgconfig(MINIZIP - "minizip-ng>=4.0.4;minizip>=4.0.4" minizip::minizip Externals/minizip-ng + "minizip>=4.0.4" minizip::minizip Externals/minizip-ng ) dolphin_find_optional_system_library(LZO Externals/LZO)