[Bf-blender-cvs] [72d9bf3fa65] tmp_lib_update_32: WebP Lib: Disable compiling utility apps
Aaron Carlisle
noreply at git.blender.org
Thu Mar 24 21:44:07 CET 2022
Commit: 72d9bf3fa652ef98cfdb0e1a74229a533d9035b0
Author: Aaron Carlisle
Date: Thu Mar 24 16:44:00 2022 -0400
Branches: tmp_lib_update_32
https://developer.blender.org/rB72d9bf3fa652ef98cfdb0e1a74229a533d9035b0
WebP Lib: Disable compiling utility apps
These are unused we only need the WebP library.
Also remove the `webpdecoder` lib from `FindWebP`
which is only used by the `DWEBP` utility app.
This fixes linking issues on some platfroms.
===================================================================
M build_files/build_environment/cmake/webp.cmake
M build_files/cmake/Modules/FindWebP.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/webp.cmake b/build_files/build_environment/cmake/webp.cmake
index 472d93cd15d..285c0748fab 100644
--- a/build_files/build_environment/cmake/webp.cmake
+++ b/build_files/build_environment/cmake/webp.cmake
@@ -4,9 +4,15 @@
# library itself does not depend on them, so should give no problems.
set(WEBP_EXTRA_ARGS
- -DWEBP_HAVE_SSE2=ON
- -DWEBP_HAVE_SSE41=OFF
- -DWEBP_HAVE_AVX2=OFF
+ -DWEBP_BUILD_ANIM_UTILS=OFF
+ -DWEBP_BUILD_CWEBP=OFF
+ -DWEBP_BUILD_DWEBP=OFF
+ -DWEBP_BUILD_GIF2WEBP=OFF
+ -DWEBP_BUILD_IMG2WEBP=OFF
+ -DWEBP_BUILD_VWEBP=OFF
+ -DWEBP_BUILD_WEBPINFO=OFF
+ -DWEBP_BUILD_WEBPMUX=OFF
+ -DWEBP_BUILD_EXTRAS=OFF
)
if(WIN32)
diff --git a/build_files/cmake/Modules/FindWebP.cmake b/build_files/cmake/Modules/FindWebP.cmake
index d9169be8c94..f6008ad2e6d 100644
--- a/build_files/cmake/Modules/FindWebP.cmake
+++ b/build_files/cmake/Modules/FindWebP.cmake
@@ -34,7 +34,6 @@ FIND_PATH(WEBP_INCLUDE_DIR
SET(_webp_FIND_COMPONENTS
webp
- webpdecoder
webpmux
webpdemux
)
More information about the Bf-blender-cvs
mailing list