mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-12 02:09:38 +08:00
4f1ced56f7
* [sdl2-image] Bump to version 2.6.3 * [sdl2-image] Update baseline * [sdl2-image] Update SHA512 * [sdl2-image] Fix SDL2_image's findwebp. * [sdl2-image] vcpkg_minimum_required is not needed. * [sdl2-image] Update version. * [sdl2-image] Patch `find_*` instead of `findwebp`. * [sdl2-image] Update version.
27 lines
969 B
Diff
27 lines
969 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 438a0aa..5f019fa 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -607,7 +607,7 @@ if(SDL2IMAGE_WEBP)
|
|
list(APPEND INSTALL_EXTRA_TARGETS webp)
|
|
else()
|
|
message(STATUS "${PROJECT_NAME}: Using system libwebp")
|
|
- find_package(webp REQUIRED)
|
|
+ find_package(webp NAMES WebP CONFIG REQUIRED)
|
|
list(APPEND PC_REQUIRES libwebp)
|
|
endif()
|
|
if(SDL2IMAGE_WEBP_SHARED)
|
|
diff --git a/SDL2_imageConfig.cmake.in b/SDL2_imageConfig.cmake.in
|
|
index ae38719..f1cc020 100644
|
|
--- a/SDL2_imageConfig.cmake.in
|
|
+++ b/SDL2_imageConfig.cmake.in
|
|
@@ -67,7 +67,7 @@ endif()
|
|
|
|
if(SDL2IMAGE_WEBP AND NOT SDL2IMAGE_VENDORED AND NOT TARGET WebP::webp)
|
|
list(APPEND webp_ROOT "${CMAKE_CURRENT_LIST_DIR}")
|
|
- find_dependency(webp)
|
|
+ find_dependency(webp NAMES WebP CONFIG)
|
|
endif()
|
|
|
|
#FIXME: can't add SDL2IMAGE_SDL2_REQUIRED_VERSION since not all SDL2 installs ship SDL2ConfigVersion.cmake
|