mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-29 15:11:49 +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>
46 lines
1.8 KiB
Diff
46 lines
1.8 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 0a5af42..636eef7 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -635,16 +635,22 @@ if(WEBP_BUILD_EXTRAS)
|
|
${CMAKE_CURRENT_BINARY_DIR}/src ${SDL_INCLUDE_DIR})
|
|
set(WEBP_HAVE_SDL 1)
|
|
target_compile_definitions(vwebp_sdl PUBLIC WEBP_HAVE_SDL)
|
|
+ target_compile_definitions(vwebp_sdl PRIVATE WEBP_HAVE_JUST_SDL_H)
|
|
+ if(WIN32)
|
|
+ target_link_libraries(vwebp_sdl dxguid winmm)
|
|
+ endif()
|
|
endif()
|
|
endif()
|
|
|
|
if(WEBP_BUILD_WEBP_JS)
|
|
# wasm2js does not support SIMD.
|
|
+ find_package(SDL REQUIRED)
|
|
if(NOT WEBP_ENABLE_SIMD)
|
|
# JavaScript version
|
|
add_executable(webp_js ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c)
|
|
- target_link_libraries(webp_js webpdecoder SDL)
|
|
+ target_link_libraries(webp_js webpdecoder ${SDL_LIBRARY})
|
|
target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
|
|
+ target_include_directories(webp_js PRIVATE ${SDL_INCLUDE_DIR})
|
|
set(WEBP_HAVE_SDL 1)
|
|
set_target_properties(
|
|
webp_js
|
|
@@ -653,12 +659,15 @@ if(WEBP_BUILD_WEBP_JS)
|
|
-sEXPORTED_RUNTIME_METHODS=cwrap")
|
|
set_target_properties(webp_js PROPERTIES OUTPUT_NAME webp)
|
|
target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_SDL)
|
|
+ target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_JUST_SDL_H)
|
|
endif()
|
|
|
|
# WASM version
|
|
add_executable(webp_wasm ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c)
|
|
- target_link_libraries(webp_wasm webpdecoder SDL)
|
|
+ target_link_libraries(webp_wasm webpdecoder ${SDL_LIBRARY})
|
|
target_include_directories(webp_wasm PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
|
|
+ target_include_directories(webp_wasm PRIVATE ${SDL_INCLUDE_DIR})
|
|
+ target_compile_definitions(webp_wasm PUBLIC EMSCRIPTEN WEBP_HAVE_JUST_SDL_H)
|
|
set_target_properties(
|
|
webp_wasm
|
|
PROPERTIES LINK_FLAGS "-sWASM=1 \
|