Merge pull request #11544 from jmallach/spng

Allow building against system libspng
This commit is contained in:
Markus Wick 2023-02-09 14:47:58 +01:00 committed by GitHub
commit 17d7b75a9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 4 deletions

View File

@ -800,7 +800,15 @@ else()
set(LZO lzo2)
endif()
pkg_check_modules(pc_spng IMPORTED_TARGET spng)
if (pc_spng_FOUND AND TARGET PkgConfig::pc_spng)
message(STATUS "Using the system libspng")
set(spng_target PkgConfig::pc_spng)
else()
message(STATUS "Using static libspng from Externals")
add_subdirectory(Externals/libspng)
set(spng_target spng)
endif()
# Using static FreeSurround from Externals
# There is no system FreeSurround library.

View File

@ -157,7 +157,7 @@ PRIVATE
${CURL_LIBRARIES}
FatFs
${ICONV_LIBRARIES}
spng
${spng_target}
${VTUNE_LIBRARIES}
)

View File

@ -81,7 +81,7 @@ PUBLIC
PRIVATE
fmt::fmt
spng
${spng_target}
)
if(WIN32)

View File

@ -183,7 +183,7 @@ PUBLIC
core
PRIVATE
fmt::fmt
spng
${spng_target}
xxhash
imgui
implot