diff --git a/CMakeLists.txt b/CMakeLists.txt index 2fa3769f8fd..afa692c4f8d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -690,7 +690,7 @@ dolphin_find_optional_system_library_pkgconfig(ZSTD libzstd>=1.4.0 zstd::zstd Ex dolphin_find_optional_system_library_pkgconfig(ZLIB zlib>=1.3.1 ZLIB::ZLIB Externals/zlib-ng) dolphin_find_optional_system_library_pkgconfig(minizip-ng - "minizip-ng>=4.0.4" minizip-ng::minizip-ng Externals/minizip-ng + "minizip-ng>=4.0.4" MINIZIP::minizip-ng Externals/minizip-ng ) dolphin_find_optional_system_library(LZO Externals/LZO) diff --git a/Externals/minizip-ng/CMakeLists.txt b/Externals/minizip-ng/CMakeLists.txt index 22f8d058ac2..adf26118410 100644 --- a/Externals/minizip-ng/CMakeLists.txt +++ b/Externals/minizip-ng/CMakeLists.txt @@ -1,96 +1,9 @@ -project(minizip C) +set(MZ_COMPAT OFF) +set(MZ_BUILD_TESTS OFF) +set(MZ_BUILD_UNIT_TESTS OFF) +set(MZ_BUILD_FUZZ_TESTS OFF) +set(MZ_CODE_COVERAGE OFF) +set(SKIP_INSTALL_ALL ON) -include(CheckFunctionExists) -include(CheckIncludeFile) - -add_library(minizip STATIC - minizip-ng/mz.h - # minizip-ng/compat/crypt.h - # minizip-ng/compat/ioapi.c - # minizip-ng/compat/ioapi.h - # minizip-ng/compat/unzip.c - # minizip-ng/compat/unzip.h - # minizip-ng/compat/zip.c - # minizip-ng/compat/zip.h - minizip-ng/mz_crypt.c - minizip-ng/mz_crypt.h - minizip-ng/mz_os.c - minizip-ng/mz_os.h - minizip-ng/mz_strm.c - minizip-ng/mz_strm.h - minizip-ng/mz_strm_buf.c - minizip-ng/mz_strm_buf.h -# minizip-ng/mz_strm_bzip.c -# minizip-ng/mz_strm_bzip.h -# minizip-ng/mz_strm_libcomp.c -# minizip-ng/mz_strm_libcomp.h -# minizip-ng/mz_strm_lzma.c -# minizip-ng/mz_strm_lzma.h - minizip-ng/mz_strm_mem.c - minizip-ng/mz_strm_mem.h - minizip-ng/mz_strm_os.h -# minizip-ng/mz_strm_pkcrypt.c -# minizip-ng/mz_strm_pkcrypt.h - minizip-ng/mz_strm_split.c - minizip-ng/mz_strm_split.h -# minizip-ng/mz_strm_wzaes.c -# minizip-ng/mz_strm_wzaes.h - minizip-ng/mz_strm_zlib.c - minizip-ng/mz_strm_zlib.h -# minizip-ng/mz_strm_zstd.c -# minizip-ng/mz_strm_zstd.h - minizip-ng/mz_zip.c - minizip-ng/mz_zip.h - minizip-ng/mz_zip_rw.c - minizip-ng/mz_zip_rw.h -) -dolphin_disable_warnings(minizip) - -if (UNIX) - target_sources(minizip PRIVATE - minizip-ng/mz_os_posix.c - minizip-ng/mz_strm_os_posix.c - ) -endif() - -if (WIN32) - target_sources(minizip PRIVATE - minizip-ng/mz_os_win32.c - minizip-ng/mz_strm_os_win32.c - ) -endif() - -# Unused files -# minizip-ng/minigzip.c -# minizip-ng/minizip.c -# minizip-ng/mz_crypt_apple.c -# minizip-ng/mz_crypt_openssl.c -# minizip-ng/mz_crypt_winvista.c -# minizip-ng/mz_crypt_winxp.c - -target_include_directories(minizip PUBLIC minizip-ng minizip-ng/compat) - -target_compile_definitions(minizip PRIVATE HAVE_ZLIB ZLIB_COMPAT MZ_ZIP_NO_CRYPTO MZ_ZIP_NO_ENCRYPTION) -if (UNIX) - target_compile_definitions(minizip PRIVATE _POSIX_C_SOURCE=200809L) - target_compile_definitions(minizip PRIVATE __USE_LARGEFILE64 _LARGEFILE64_SOURCE) -endif() - -check_include_file(stdint.h HAVE_STDINT_H) -if (HAVE_STDINT_H) - target_compile_definitions(minizip PRIVATE HAVE_STDINT_H) -endif() - -check_include_file(inttypes.h HAVE_INTTYPES_H) -if (HAVE_INTTYPES_H) - target_compile_definitions(minizip PRIVATE HAVE_INTTYPES_H) -endif() - -check_function_exists(fseeko HAVE_FSEEKO) -if (NOT HAVE_FSEEKO) - target_compile_definitions(minizip PRIVATE NO_FSEEKO) -endif() - -target_link_libraries(minizip PUBLIC ZLIB::ZLIB) - -add_library(minizip-ng::minizip-ng ALIAS minizip) +add_subdirectory(minizip-ng) +dolphin_disable_warnings(minizip-ng) diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt index 2447d1ed401..33a03729ca4 100644 --- a/Source/Core/Common/CMakeLists.txt +++ b/Source/Core/Common/CMakeLists.txt @@ -183,7 +183,7 @@ PUBLIC enet::enet fmt::fmt MbedTLS::mbedtls - minizip-ng::minizip-ng + MINIZIP::minizip-ng sfml-network PRIVATE diff --git a/Source/Core/DiscIO/CMakeLists.txt b/Source/Core/DiscIO/CMakeLists.txt index 884f3de4f2d..d72c9c1bda5 100644 --- a/Source/Core/DiscIO/CMakeLists.txt +++ b/Source/Core/DiscIO/CMakeLists.txt @@ -75,7 +75,7 @@ PUBLIC PRIVATE fmt::fmt - minizip-ng::minizip-ng + MINIZIP::minizip-ng pugixml ZLIB::ZLIB ) diff --git a/Source/Core/UICommon/CMakeLists.txt b/Source/Core/UICommon/CMakeLists.txt index 2f248e1066b..e141eab6f94 100644 --- a/Source/Core/UICommon/CMakeLists.txt +++ b/Source/Core/UICommon/CMakeLists.txt @@ -26,7 +26,7 @@ PUBLIC common core cpp-optparse - minizip-ng::minizip-ng + MINIZIP::minizip-ng pugixml PRIVATE