mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-03 07:44:34 +08:00
086d63cc4e
Fixes https://github.com/microsoft/vcpkg/issues/36769 Removed `fix-pkgconfig.patch`. - [X] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [X] SHA512s are updated for each updated download. - [ ] ~~The "supports" clause reflects platforms that may be fixed by this new version.~~ - [ ] ~~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~~ - [X] Any patches that are no longer applied are deleted from the port's directory. - [X] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [X] Only one version is added to each modified port's versions file. All features passed with following triplets: ``` x86-windows x64-windows x64-windows-static ``` Usage test pass with following triplets: ``` x86-windows x64-windows x64-windows-static ```
27 lines
982 B
Diff
27 lines
982 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 65a8811..1f29faa 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -690,7 +690,7 @@ if(SDL2IMAGE_WEBP)
|
|
add_library(SDL2_image::external_libwebp ALIAS 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 c59e844..7b16a60 100644
|
|
--- a/SDL2_imageConfig.cmake.in
|
|
+++ b/SDL2_imageConfig.cmake.in
|
|
@@ -74,7 +74,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
|