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

use pkg_search_module to find minizip-ng or minizip 

OpenBSD calls minizip-ng's .pc file minizip.pc
Others call   minizip-ng's .pc file minizip-ng.pc
This commit is contained in:
Guilherme Janczak 2024-05-07 04:00:56 +00:00
parent ba462578ac
commit cd25e91ca2
No known key found for this signature in database
GPG Key ID: 9F1927DAAC7F9DCD
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMake/DolphinLibraryTools.cmake
View File

@ -79,7 +79,7 @@ function(dolphin_find_optional_system_library_pkgconfig library search alias bun
dolphin_optional_system_library(${library}) dolphin_optional_system_library(${library})
string(TOUPPER ${library} upperlib) string(TOUPPER ${library} upperlib)
if(RESOLVED_USE_SYSTEM_${upperlib}) if(RESOLVED_USE_SYSTEM_${upperlib})
pkg_check_modules(${library} ${search} ${ARGN} IMPORTED_TARGET) pkg_search_module(${library} ${search} ${ARGN} IMPORTED_TARGET)
if((NOT ${library}_FOUND) AND (NOT ${RESOLVED_USE_SYSTEM_${upperlib}} STREQUAL "AUTO")) if((NOT ${library}_FOUND) AND (NOT ${RESOLVED_USE_SYSTEM_${upperlib}} STREQUAL "AUTO"))
message(FATAL_ERROR "No system ${library} was found. Please install it or set USE_SYSTEM_${upperlib} to AUTO or OFF.") message(FATAL_ERROR "No system ${library} was found. Please install it or set USE_SYSTEM_${upperlib} to AUTO or OFF.")
endif() endif()

5
CMakeLists.txt
View File

@ -674,8 +674,9 @@ 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(ZLIB zlib-ng ZLIB::ZLIB Externals/zlib-ng)
# TODO: Some distributions might call this package "minizip" without the "-ng" suffix. dolphin_find_optional_system_library_pkgconfig(MINIZIP
dolphin_find_optional_system_library_pkgconfig(MINIZIP minizip-ng>=4.0.4 minizip::minizip Externals/minizip-ng) "minizip-ng>=4.0.4;minizip>=4.0.4" minizip::minizip Externals/minizip-ng
)
dolphin_find_optional_system_library(LZO Externals/LZO) dolphin_find_optional_system_library(LZO Externals/LZO)