mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-21 17:17:50 +08:00
91dd61bd44
* [libwebp] Update to 1.3.0
* Fix [core] on x64-osx
* Fix features and dependencies
* Cleanup tool installation
* Usage
* Lift restriction for vwebp tool
* [mapnik] Fix libwebp
* [qt5-imageformats] Use libwebp pc files
* Revert "Lift restriction for vwebp tool"
This reverts commit 42e0273f65.
* [gdal] Use upstream WebP config
* Revert no longer necessary changes to mapnik.
* Remove unnecessary patch that git checkout didn't remove.
---------
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
19 lines
1.1 KiB
Diff
19 lines
1.1 KiB
Diff
diff --git a/cmake/WebPConfig.cmake.in b/cmake/WebPConfig.cmake.in
|
|
index f334739..43f10e0 100644
|
|
--- a/cmake/WebPConfig.cmake.in
|
|
+++ b/cmake/WebPConfig.cmake.in
|
|
@@ -12,5 +12,12 @@ include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
|
|
|
|
set(WebP_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
|
|
set(WEBP_INCLUDE_DIRS ${WebP_INCLUDE_DIRS})
|
|
-set(WebP_LIBRARIES "@INSTALLED_LIBRARIES@")
|
|
+set(WebP_LIBRARIES "")
|
|
+include(SelectLibraryConfigurations)
|
|
+foreach(_vcpkg_libwebp_lib IN ITEMS @INSTALLED_LIBRARIES@ sharpyuv)
|
|
+ find_library(_vcpkg_${_vcpkg_libwebp_lib}_LIBRARY_RELEASE NAMES ${_vcpkg_libwebp_lib} lib${_vcpkg_libwebp_lib} NAMES_PER_DIR PATHS "${VCPKG_IMPORT_PREFIX}/lib" NO_DEFAULT_PATH)
|
|
+ find_library(_vcpkg_${_vcpkg_libwebp_lib}_LIBRARY_DEBUG NAMES ${_vcpkg_libwebp_lib}d lib${_vcpkg_libwebp_lib}d ${_vcpkg_libwebp_lib} lib${_vcpkg_libwebp_lib} NAMES_PER_DIR PATHS "${VCPKG_IMPORT_PREFIX}/debug/lib" NO_DEFAULT_PATH)
|
|
+ select_library_configurations(_vcpkg_${_vcpkg_libwebp_lib})
|
|
+ list(APPEND WebP_LIBRARIES ${_vcpkg_${_vcpkg_libwebp_lib}_LIBRARIES})
|
|
+endforeach()
|
|
set(WEBP_LIBRARIES "${WebP_LIBRARIES}")
|