From 850bf76bf5a92df9661021b83948df79f9932aef Mon Sep 17 00:00:00 2001 From: David Capello Date: Sat, 9 Jun 2018 13:04:56 -0300 Subject: [PATCH] Update libwebp module --- CMakeLists.txt | 2 +- third_party/CMakeLists.txt | 11 +++++++++-- third_party/libwebp | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e3edb4a7..b99a196d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -237,7 +237,7 @@ add_definitions(-DPNG_NO_MMX_CODE) # Do not use MMX optimizations in PNG code # libwebp if(WITH_WEBP_SUPPORT) - set(WEBP_LIBRARIES webp webpdemux webpmux) + set(WEBP_LIBRARIES webp) set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) include_directories(${WEBP_INCLUDE_DIR}) endif() diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index bd582012a..1b7603523 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -33,8 +33,15 @@ if(NOT USE_SHARED_GIFLIB) endif() if(WITH_WEBP_SUPPORT) - # Enable img2webp so "webpmux" library is built - set(WEBP_BUILD_IMG2WEBP ON CACHE BOOL "Build the img2webp animation tool.") + set(WEBP_BUILD_ANIM_UTILS OFF CACHE BOOL "Build animation utilities.") + set(WEBP_BUILD_CWEBP OFF CACHE BOOL "Build the cwebp command line tool.") + set(WEBP_BUILD_DWEBP OFF CACHE BOOL "Build the dwebp command line tool.") + set(WEBP_BUILD_GIF2WEBP OFF CACHE BOOL "Build the gif2webp conversion tool.") + set(WEBP_BUILD_IMG2WEBP OFF CACHE BOOL "Build the img2webp animation tool.") + set(WEBP_BUILD_VWEBP OFF CACHE BOOL "Build the vwebp viewer tool.") + set(WEBP_BUILD_WEBPINFO OFF CACHE BOOL "Build the webpinfo command line tool.") + set(WEBP_BUILD_WEBPMUX OFF CACHE BOOL "Build the webpmux command line tool.") + set(WEBP_BUILD_WEBP_JS OFF CACHE BOOL "Emscripten build of webp.js.") add_subdirectory(libwebp) endif() diff --git a/third_party/libwebp b/third_party/libwebp index b2db361ca..c56a02d97 160000 --- a/third_party/libwebp +++ b/third_party/libwebp @@ -1 +1 @@ -Subproject commit b2db361ca681eef4f99c07dee0fb9bfeb99be6bf +Subproject commit c56a02d9712fd4dddfe43dad4778f4bcce38de15