From 45bdc8cd18e99cd8ad97374f613c47906145e431 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Thu, 21 Sep 2023 20:13:50 +0200 Subject: [PATCH] cmake: re-use sharpyuv from SDL_image's vendored libwebp (if available) --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ff3a80d4b2..5699bcea7e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -199,14 +199,14 @@ if(AVIF_LOCAL_LIBSHARPYUV) else(AVIF_LOCAL_LIBSHARPYUV) find_package(libsharpyuv QUIET) # not required endif() -if(libsharpyuv_FOUND) +if(LIBAVIF_WITH_SHARPYUV_SDLIMAGE) #Control sharpyuv through sdl_image message(STATUS "libavif: libsharpyuv found; sharp rgb to yuv conversion enabled.") set(AVIF_PLATFORM_DEFINITIONS ${AVIF_PLATFORM_DEFINITIONS} -DAVIF_LIBSHARPYUV_ENABLED=1) - set(AVIF_PLATFORM_INCLUDES ${AVIF_PLATFORM_INCLUDES} ${LIBSHARPYUV_INCLUDE_DIR}) - set(AVIF_PLATFORM_LIBRARIES ${AVIF_PLATFORM_LIBRARIES} ${LIBSHARPYUV_LIBRARY}) -else(libsharpyuv_FOUND) + #set(AVIF_PLATFORM_INCLUDES ${AVIF_PLATFORM_INCLUDES} ${LIBSHARPYUV_INCLUDE_DIR}) + set(AVIF_PLATFORM_LIBRARIES sharpyuv) +else() message(STATUS "libavif: libsharpyuv not found") -endif(libsharpyuv_FOUND) +endif() # --------------------------------------------------------------------------------------- # Enable all warnings