mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-09 22:39:01 +08:00
99346bb692
* Update to v1.2.2 * Fix libwebpmux Windows name breakage The pc file relies on the original output name: No 'lib' prefix for MSVC. No 'liblib' prefix for mingw. * Minor portfile updates * Don't self-depend on default features * Fix the libwebpmux feature * Fix internal tool dependencies * Drop Xrandr patch (fixed in freeglut) * Drop X11 patch (fixed in freeglut) * Cleanup CMake config patch, no extra case hacks * Adjust webp lib names in skia, qt5-imageformats * Adjust downstream WEBP cmake usage * Debug qtimageformats [skip actions] * [tiff] Drive-by fix for CMake warning * Drop non-standard debug postfix * Update indentation * Update port versions * Update versions * Revert qtimageformat debug change * Fixup qt5-imageformats change * Update versions
25 lines
1.3 KiB
Diff
25 lines
1.3 KiB
Diff
diff --git a/cmake/WebPConfig.cmake.in b/cmake/WebPConfig.cmake.in
|
|
index 822fc59..fb31829 100644
|
|
--- a/cmake/WebPConfig.cmake.in
|
|
+++ b/cmake/WebPConfig.cmake.in
|
|
@@ -5,7 +5,17 @@ set(WEBP_VERSION ${WebP_VERSION})
|
|
|
|
include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
|
|
|
|
-set(WebP_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
|
|
+get_filename_component(_vcpkg_libwebp_root "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE)
|
|
+set(WebP_INCLUDE_DIRS "${_vcpkg_libwebp_root}/include")
|
|
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@)
|
|
+ string(REPLACE "libwebpmux" "webpmux" _vcpkg_libwebp_lib "${_vcpkg_libwebp_lib}") # offical OUTPUT_NAME
|
|
+ find_library(_vcpkg_${_vcpkg_libwebp_lib}_LIBRARY_RELEASE NAMES ${_vcpkg_libwebp_lib} NAMES_PER_DIR PATHS "${_vcpkg_libwebp_root}/lib" NO_DEFAULT_PATH)
|
|
+ find_library(_vcpkg_${_vcpkg_libwebp_lib}_LIBRARY_DEBUG NAMES ${_vcpkg_libwebp_lib}d ${_vcpkg_libwebp_lib} NAMES_PER_DIR PATHS "${_vcpkg_libwebp_root}/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}")
|
|
+unset(_vcpkg_libwebp_root)
|