Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/5254

6 files changed, 307 insertions, 82 deletions

diff --git a/ports/libwebp/0001-build-fixes.patch b/ports/libwebp/0001-build-fixes.patch
new file mode 100644
index 000000000..c25ecbfee
--- /dev/null
+++ b/ports/libwebp/0001-build-fixes.patch
@@ -0,0 +1,163 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 499ddce..895fda9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -159,6 +159,10 @@ add_definitions(-DHAVE_CONFIG_H)
+ if(MSVC)
+   # avoid security warnings for e.g., fopen() used in the examples.
+   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
++  add_definitions(-DWEBP_HAVE_JUST_SDL_H)
++  if(BUILD_SHARED_LIBS)
++    add_definitions(-DWEBP_EXTERN=__declspec\(dllexport\))
++  endif()
+ else()
+   add_definitions(-Wall)
+ endif()
+@@ -342,19 +346,23 @@ if(WEBP_BUILD_ANIM_UTILS
+                     "example_util_[^ ]*")
+   list(APPEND EXAMPLEUTIL_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/examples/stopwatch.h)
+   add_library(exampleutil ${EXAMPLEUTIL_SRCS})
++  set_target_properties(exampleutil PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
+   target_include_directories(
+     exampleutil
+     PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>)
++  target_link_libraries(exampleutil imageioutil)
+ 
+   parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/imageio "IMAGEIOUTILS_SRCS"
+                     "imageio_util_[^ ]*")
+   add_library(imageioutil ${IMAGEIOUTILS_SRCS})
++  set_target_properties(imageioutil PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
+   target_link_libraries(imageioutil webp)
+ 
+   # Image-decoding utility library.
+   parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/imageio "IMAGEDEC_SRCS"
+                     "imagedec_[^ ]*")
+   add_library(imagedec ${IMAGEDEC_SRCS})
++  set_target_properties(imagedec PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
+   target_link_libraries(imagedec
+                         imageioutil
+                         webpdemux
+@@ -365,7 +373,8 @@ if(WEBP_BUILD_ANIM_UTILS
+   parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/imageio "IMAGEENC_SRCS"
+                     "imageenc_[^ ]*")
+   add_library(imageenc ${IMAGEENC_SRCS})
+-  target_link_libraries(imageenc webp)
++  set_target_properties(imageenc PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
++  target_link_libraries(imageenc imageioutil webp)
+ 
+   set_property(TARGET exampleutil
+                       imageioutil
+@@ -380,7 +389,7 @@ if(WEBP_BUILD_DWEBP)
+   parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "DWEBP_SRCS" "dwebp")
+   add_executable(dwebp ${DWEBP_SRCS})
+   target_link_libraries(dwebp exampleutil imagedec imageenc)
+-  target_include_directories(dwebp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
++  target_include_directories(dwebp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
+   install(TARGETS dwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ 
+@@ -389,13 +398,14 @@ if(WEBP_BUILD_CWEBP)
+   parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "CWEBP_SRCS" "cwebp")
+   add_executable(cwebp ${CWEBP_SRCS})
+   target_link_libraries(cwebp exampleutil imagedec webp)
+-  target_include_directories(cwebp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
++  target_include_directories(cwebp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
+   install(TARGETS cwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ 
+ if(WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP)
+   parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/mux "WEBP_MUX_SRCS" "")
+   add_library(libwebpmux ${WEBP_MUX_SRCS})
++  set_target_properties(libwebpmux PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
+   target_link_libraries(libwebpmux webp)
+   target_include_directories(libwebpmux
+                              PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
+@@ -411,7 +421,7 @@ if(WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP)
+                                    "${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux.h;\
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux_types.h;\
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/types.h;")
+-  set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME webpmux)
++  #set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME webpmux)
+   list(APPEND INSTALLED_LIBRARIES libwebpmux)
+   configure_pkg_config("src/mux/libwebpmux.pc")
+ endif()
+@@ -428,7 +438,7 @@ if(WEBP_BUILD_GIF2WEBP)
+                         webp
+                         libwebpmux
+                         ${WEBP_DEP_GIF_LIBRARIES})
+-  target_include_directories(gif2webp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
++  target_include_directories(gif2webp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
+   install(TARGETS gif2webp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ 
+@@ -444,7 +454,7 @@ if(WEBP_BUILD_IMG2WEBP)
+                         imageioutil
+                         webp
+                         libwebpmux)
+-  target_include_directories(img2webp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
++  target_include_directories(img2webp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
+   install(TARGETS img2webp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ 
+@@ -464,6 +474,7 @@ if(WEBP_BUILD_VWEBP)
+                           webpdemux)
+     target_include_directories(vwebp
+                                PRIVATE GLUT::GLUT
++                                       ${CMAKE_CURRENT_SOURCE_DIR}/src
+                                        ${CMAKE_CURRENT_BINARY_DIR}/src
+                                        ${OPENGL_INCLUDE_DIR})
+     install(TARGETS vwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+@@ -483,7 +494,7 @@ if(WEBP_BUILD_WEBPINFO)
+                     "webpinfo")
+   add_executable(webpinfo ${WEBPINFO_SRCS})
+   target_link_libraries(webpinfo exampleutil imageioutil)
+-  target_include_directories(webpinfo PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
++  target_include_directories(webpinfo PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
+   install(TARGETS webpinfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ 
+@@ -493,7 +504,7 @@ if(WEBP_BUILD_WEBPMUX)
+                     "webpmux")
+   add_executable(webpmux ${WEBPMUX_SRCS})
+   target_link_libraries(webpmux exampleutil imageioutil libwebpmux webp)
+-  target_include_directories(webpmux PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
++  target_include_directories(webpmux PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
+   install(TARGETS webpmux RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ 
+@@ -540,7 +551,7 @@ if(WEBP_BUILD_WEBP_JS)
+   # JavaScript version
+   add_executable(webp_js ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c)
+   target_link_libraries(webp_js webpdecoder SDL)
+-  target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
++  target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+   set(WEBP_HAVE_SDL 1)
+   set_target_properties(
+     webp_js
+@@ -553,7 +564,7 @@ if(WEBP_BUILD_WEBP_JS)
+   # WASM version
+   add_executable(webp_wasm ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c)
+   target_link_libraries(webp_wasm webpdecoder SDL)
+-  target_include_directories(webp_wasm PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
++  target_include_directories(webp_wasm PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+   set_target_properties(
+     webp_wasm
+     PROPERTIES LINK_FLAGS "-s WASM=1 -s 'BINARYEN_METHOD=\"native-wasm\"' \
+@@ -579,7 +590,7 @@ if(WEBP_BUILD_ANIM_UTILS)
+                         libwebpmux
+                         webpdemux
+                         ${WEBP_DEP_GIF_LIBRARIES})
+-  target_include_directories(anim_diff PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
++  target_include_directories(anim_diff PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
+ 
+   # anim_dump
+   include_directories(${WEBP_DEP_IMG_INCLUDE_DIRS} ${WEBP_DEP_GIF_INCLUDE_DIRS})
+@@ -595,7 +606,7 @@ if(WEBP_BUILD_ANIM_UTILS)
+                         libwebpmux
+                         webpdemux
+                         ${WEBP_DEP_GIF_LIBRARIES})
+-  target_include_directories(anim_dump PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
++  target_include_directories(anim_dump PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src)
+ endif()
+ 
+ # Install the different headers and libraries.
diff --git a/ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch b/ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch
new file mode 100644
index 000000000..2ed199ec8
--- /dev/null
+++ b/ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch
@@ -0,0 +1,69 @@
+diff --git a/cmake/WebPConfig.cmake.in b/cmake/WebPConfig.cmake.in
+index bb22164..3ad256f 100644
+--- a/cmake/WebPConfig.cmake.in
++++ b/cmake/WebPConfig.cmake.in
+@@ -4,8 +4,60 @@ set(WEBP_VERSION ${WebP_VERSION})
+ @PACKAGE_INIT@
+ 
+ include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
++include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
+ 
+-set(WebP_INCLUDE_DIRS "webp")
+-set(WEBP_INCLUDE_DIRS ${WebP_INCLUDE_DIRS})
+-set(WebP_LIBRARIES "@INSTALLED_LIBRARIES@")
+-set(WEBP_LIBRARIES "${WebP_LIBRARIES}")
++find_path(WEBP_INCLUDE_DIR NAMES webp/types.h)
++set(WebP_INCLUDE_DIR ${WEBP_INCLUDE_DIR})
++set(WebP_INCLUDE_DIRS ${WEBP_INCLUDE_DIR})
++set(WEBP_INCLUDE_DIRS ${WEBP_INCLUDE_DIR})
++
++if(NOT WEBP_BASE_LIBRARY AND NOT WebP_BASE_LIBRARY)
++  find_library(WEBP_BASE_LIBRARY_RELEASE NAMES webp)
++  find_library(WEBP_BASE_LIBRARY_DEBUG NAMES webpd)
++  select_library_configurations(WEBP_BASE)
++  set(WebP_BASE_LIBRARY ${WEBP_BASE_LIBRARY})
++  if(WEBP_BASE_LIBRARY)
++    list(APPEND WEBP_LIBRARIES "${WEBP_BASE_LIBRARY}")
++    list(APPEND WebP_LIBRARIES "${WebP_BASE_LIBRARY}")
++  endif()
++endif()
++
++if(NOT WEBP_DECODER_LIBRARY AND NOT WebP_DECODER_LIBRARY)
++  find_library(WEBP_DECODER_LIBRARY_RELEASE NAMES webpdecoder)
++  find_library(WEBP_DECODER_LIBRARY_DEBUG NAMES webpdecoderd)
++  select_library_configurations(WEBP_DECODER)
++  set(WebP_DECODER_LIBRARY ${WEBP_DECODER_LIBRARY})
++  if(WEBP_DECODER_LIBRARY)
++    list(APPEND WEBP_LIBRARIES "${WEBP_DECODER_LIBRARY}")
++    list(APPEND WebP_LIBRARIES "${WebP_DECODER_LIBRARY}")
++  endif()
++endif()
++
++if(NOT WEBP_DEMUX_LIBRARY AND NOT WebP_DEMUX_LIBRARY)
++  find_library(WEBP_DEMUX_LIBRARY_RELEASE NAMES webpdemux)
++  find_library(WEBP_DEMUX_LIBRARY_DEBUG NAMES webpdemuxd)
++  select_library_configurations(WEBP_DEMUX)
++  set(WebP_DEMUX_LIBRARY ${WEBP_DEMUX_LIBRARY})
++  if(WEBP_DEMUX_LIBRARY)
++    list(APPEND WEBP_LIBRARIES "${WEBP_DEMUX_LIBRARY}")
++    list(APPEND WebP_LIBRARIES "${WebP_DEMUX_LIBRARY}")
++  endif()
++endif()
++
++if(NOT WEBP_MUX_LIBRARY AND NOT WebP_MUX_LIBRARY)
++  find_library(WEBP_MUX_LIBRARY_RELEASE NAMES libwebpmux)
++  find_library(WEBP_MUX_LIBRARY_DEBUG NAMES libwebpmuxd)
++  select_library_configurations(WEBP_MUX)
++  set(WebP_MUX_LIBRARY ${WEBP_MUX_LIBRARY})
++  if(WEBP_MUX_LIBRARY)
++    list(APPEND WEBP_LIBRARIES "${WEBP_MUX_LIBRARY}")
++    list(APPEND WebP_LIBRARIES "${WebP_MUX_LIBRARY}")
++  endif()
++endif()
++
++set(WEBP_LIBRARY ${WEBP_BASE_LIBRARY})
++set(WebP_LIBRARY ${WebP_BASE_LIBRARY})
++if(WEBP_BASE_LIBRARY AND WEBP_INCLUDE_DIR)
++  set(WEBP_FOUND 1)
++  set(WebP_FOUND 1)
++endif()
diff --git a/ports/libwebp/CONTROL b/ports/libwebp/CONTROL
index 3e3ae16d8..9ffa6426d 100644
--- a/ports/libwebp/CONTROL
+++ b/ports/libwebp/CONTROL
@@ -1,3 +1,9 @@
 Source: libwebp
-Version: 0.6.1-2
+Version: 1.0.2-1
 Description: Lossy compression of digital photographic images.
+Build-Depends: opengl
+Default-Features: all
+
+Feature: all
+Description: enable all webp features
+Build-Depends: giflib, libjpeg-turbo, zlib, libpng, tiff, freeglut, sdl1
diff --git a/ports/libwebp/FindWebP.cmake b/ports/libwebp/FindWebP.cmake
deleted file mode 100644
index c39a0eb05..000000000
--- a/ports/libwebp/FindWebP.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-include(SelectLibraryConfigurations)
-include(FindPackageHandleStandardArgs)
-
-# If the user has provided ``WEBP_ROOT``, use it!  Choose items found
-# at this location over system locations.
-if( EXISTS "$ENV{WEBP_ROOT}" )
-  file( TO_CMAKE_PATH "$ENV{WEBP_ROOT}" WEBP_ROOT )
-  set( WEBP_ROOT "${WEBP_ROOT}" CACHE PATH "Prefix for WebP installation." )
-elseif(EXISTS "$ENV{WEBP_DIR}" )
-  file( TO_CMAKE_PATH "$ENV{WEBP_DIR}" WEBP_ROOT )
-  set( WEBP_ROOT "${WEBP_ROOT}" CACHE PATH "Prefix for WebP installation." )
-endif()
-
-if(NOT WEBP_INCLUDE_DIR)
-  FIND_PATH(WEBP_INCLUDE_DIR NAMES webp/decode.h)
-endif()
-
-if(NOT WEBP_LIBRARY)
-  find_library(WEBP_LIBRARY_RELEASE NAMES webp PATHS ${WEBP_ROOT} PATH_SUFFIXES webp )
-  find_library(WEBP_LIBRARY_DEBUG NAMES webpd PATHS ${WEBP_ROOT} PATH_SUFFIXES debug webp webp/debug debug/webp)
-  select_library_configurations(WEBP)
-endif()
-
-SET(WEBP_LIBRARIES ${WEBP_LIBRARY})
-SET(WEBP_INCLUDE_DIRS ${WEBP_INCLUDE_DIR})
-
-find_package_handle_standard_args(WEBP REQUIRED_VARS WEBP_LIBRARY WEBP_INCLUDE_DIR)
diff --git a/ports/libwebp/build_fixes.patch b/ports/libwebp/build_fixes.patch
deleted file mode 100644
index 72cb304a9..000000000
--- a/ports/libwebp/build_fixes.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3b105e37..f9b806c4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -106,6 +106,9 @@ endforeach()
- if(MSVC)
-   # avoid security warnings for e.g., fopen() used in the examples.
-   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-+  if(BUILD_SHARED_LIBS)
-+    add_definitions(-DWEBP_EXTERN=__declspec\(dllexport\))
-+  endif()
- else()
-   add_definitions(-Wall)
- endif()
-@@ -235,6 +238,10 @@ if(WEBP_BUILD_GIF2WEBP AND NOT GIF_FOUND)
- endif()
- 
- if(WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP)
-+  set(WEBP_BUILD_MUX ON)
-+endif()
-+
-+if(WEBP_BUILD_MUX)
-   parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/mux "WEBP_MUX_SRCS"
-     "")
-   add_library(webpmux ${WEBP_MUX_SRCS})
-@@ -322,6 +329,7 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/decode.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/types.h
-         DESTINATION include/webp)
- install(TARGETS ${INSTALLED_LIBRARIES}
-+        RUNTIME DESTINATION bin
-         LIBRARY DESTINATION lib
-         ARCHIVE DESTINATION lib)
- 
diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake
index e4f5dbbc8..bae24ddff 100644
--- a/ports/libwebp/portfile.cmake
+++ b/ports/libwebp/portfile.cmake
@@ -1,37 +1,84 @@
 include(vcpkg_common_functions)
 
 vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO webmproject/libwebp
-    REF v0.6.1
-    SHA512 313b345a01c91eb07c2e4d46b93fcda9c50dca9e05e39f757238a679355514a2e9bc9bc220f3d3eb6d6a55148957cb2be14dac330203953337759841af1a32bf
-    HEAD_REF master
+  OUT_SOURCE_PATH SOURCE_PATH
+  REPO webmproject/libwebp
+  REF v1.0.2
+  SHA512 27ca4e7c87d3114a5d3dba6801b5608207a9adc44d0fa62f7523d39be789d389d342d9db5e28c9301eff8fcb1471809c76680a68abd4ff97217b17dd13c4e22b
+  HEAD_REF master
+  PATCHES
+    0001-build-fixes.patch
+    0002-cmake-config-add-backwards-compatibility.patch
 )
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/build_fixes.patch
-)
+set(WEBP_BUILD_ANIM_UTILS OFF)
+set(WEBP_BUILD_GIF2WEBP OFF)
+set(WEBP_BUILD_IMG2WEBP OFF)
+set(WEBP_BUILD_VWEBP OFF)
+set(WEBP_BUILD_WEBPINFO OFF)
+set(WEBP_BUILD_WEBPMUX OFF)
+set(WEBP_BUILD_EXTRAS OFF)
+set(WEBP_NEAR_LOSSLESS OFF)
+if("all" IN_LIST FEATURES)
+  set(WEBP_BUILD_ANIM_UTILS ON)
+  set(WEBP_NEAR_LOSSLESS ON)
+  set(WEBP_BUILD_GIF2WEBP ON)
+  set(WEBP_BUILD_IMG2WEBP ON)
+  set(WEBP_BUILD_VWEBP ON)
+  set(WEBP_BUILD_WEBPINFO ON)
+  set(WEBP_BUILD_WEBPMUX ON)
+  set(WEBP_BUILD_EXTRAS ON)
+endif()
 
 vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS
-        -DCMAKE_DEBUG_POSTFIX=d
-        -DWEBP_BUILD_MUX=ON
+  SOURCE_PATH ${SOURCE_PATH}
+  PREFER_NINJA
+  OPTIONS
+    -DWEBP_ENABLE_SIMD:BOOL=ON
+    -DWEBP_BUILD_ANIM_UTILS:BOOL=${WEBP_BUILD_ANIM_UTILS}
+    -DWEBP_BUILD_CWEBP:BOOL=OFF
+    -DWEBP_BUILD_DWEBP:BOOL=OFF
+    -DWEBP_BUILD_GIF2WEBP:BOOL=${WEBP_BUILD_GIF2WEBP}
+    -DWEBP_BUILD_IMG2WEBP:BOOL=${WEBP_BUILD_IMG2WEBP}
+    -DWEBP_BUILD_VWEBP:BOOL=${WEBP_BUILD_VWEBP}
+    -DWEBP_BUILD_WEBPINFO:BOOL=${WEBP_BUILD_WEBPINFO}
+    -DWEBP_BUILD_WEBPMUX:BOOL=${WEBP_BUILD_WEBPMUX}
+    -DWEBP_BUILD_EXTRAS:BOOL=${WEBP_BUILD_EXTRAS}
+    -DWEBP_BUILD_WEBP_JS:BOOL=OFF
+    -DWEBP_NEAR_LOSSLESS:BOOL=${WEBP_NEAR_LOSSLESS}
+    -DWEBP_ENABLE_SWAP_16BIT_CSP:BOOL=OFF
+  OPTIONS_DEBUG
+    -DCMAKE_DEBUG_POSTFIX=d
 )
 
 vcpkg_install_cmake()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+vcpkg_copy_pdbs()
+vcpkg_fixup_cmake_targets(CONFIG_PATH "share/WebP/cmake/" TARGET_PATH "share/WebP/")
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share)
 
-# Handle copyright
+if("all" IN_LIST FEATURES)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/get_disto.exe)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/gif2webp.exe)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/img2webp.exe)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vwebp.exe)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vwebp_sdl.exe)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webpinfo.exe)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webpmux.exe)
+  file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/webp_quality.exe)
+  file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/libwebp/)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/get_disto.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/get_disto.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/gif2webp.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/gif2webp.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/img2webp.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/img2webp.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/vwebp.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/vwebp.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/vwebp_sdl.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/vwebp_sdl.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webpinfo.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/webpinfo.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webpmux.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/webpmux.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/bin/webp_quality.exe ${CURRENT_PACKAGES_DIR}/tools/libwebp/webp_quality.exe)
+  vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/libwebp)
+endif()
+
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libwebp)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/libwebp/COPYING ${CURRENT_PACKAGES_DIR}/share/libwebp/copyright)
-
-vcpkg_copy_pdbs()
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindWebP.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/libwebp)