mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-09 20:59:00 +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
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index bd1bebb..4ce801d 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -214,6 +214,9 @@ endfunction()
|
|
if(MSVC)
|
|
# avoid security warnings for e.g., fopen() used in the examples.
|
|
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
|
|
+ if(BUILD_SHARED_LIBS)
|
|
+ add_definitions("-DWEBP_EXTERN=__declspec(dllexport)" "-DWEBP_DLL")
|
|
+ endif()
|
|
else()
|
|
add_definitions(-Wall)
|
|
endif()
|
|
@@ -586,8 +589,12 @@ if(WEBP_BUILD_EXTRAS)
|
|
# webp_quality
|
|
add_executable(webp_quality ${WEBP_QUALITY_SRCS} ${WEBP_EXTRAS_SRCS})
|
|
target_link_libraries(webp_quality exampleutil imagedec)
|
|
+ if(BUILD_SHARED_LIBS)
|
|
+ target_link_libraries(webp_quality webpdspdecode)
|
|
+ endif()
|
|
target_include_directories(webp_quality
|
|
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
|
|
+ ${CMAKE_CURRENT_SOURCE_DIR}/src
|
|
${CMAKE_CURRENT_BINARY_DIR})
|
|
|
|
# vwebp_sdl
|
|
@@ -620,7 +627,7 @@ if(WEBP_BUILD_WEBP_JS)
|
|
-s EXPORTED_FUNCTIONS='[\"_WebpToSDL\"]' -s INVOKE_RUN=0 \
|
|
-s EXPORTED_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_SDL WEBP_HAVE_JUST_SDL_H)
|
|
endif()
|
|
|
|
# WASM version
|