Merge pull request #11544 from jmallach/spng
Allow building against system libspng
This commit is contained in:
commit
17d7b75a9b
|
@ -800,7 +800,15 @@ else()
|
|||
set(LZO lzo2)
|
||||
endif()
|
||||
|
||||
add_subdirectory(Externals/libspng)
|
||||
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.
|
||||
|
|
|
@ -157,7 +157,7 @@ PRIVATE
|
|||
${CURL_LIBRARIES}
|
||||
FatFs
|
||||
${ICONV_LIBRARIES}
|
||||
spng
|
||||
${spng_target}
|
||||
${VTUNE_LIBRARIES}
|
||||
)
|
||||
|
||||
|
|
|
@ -81,7 +81,7 @@ PUBLIC
|
|||
|
||||
PRIVATE
|
||||
fmt::fmt
|
||||
spng
|
||||
${spng_target}
|
||||
)
|
||||
|
||||
if(WIN32)
|
||||
|
|
|
@ -183,7 +183,7 @@ PUBLIC
|
|||
core
|
||||
PRIVATE
|
||||
fmt::fmt
|
||||
spng
|
||||
${spng_target}
|
||||
xxhash
|
||||
imgui
|
||||
implot
|
||||
|
|
Loading…
Reference in New Issue