[Bf-blender-cvs] [59de9ceda05] master: MSVC: Fix build issue with webp

Ray Molenkamp noreply at git.blender.org
Fri Mar 25 14:31:20 CET 2022


Commit: 59de9ceda05c84670d27fcb526d513e30a8e29b4
Author: Ray Molenkamp
Date:   Fri Mar 25 07:31:15 2022 -0600
Branches: master
https://developer.blender.org/rB59de9ceda05c84670d27fcb526d513e30a8e29b4

MSVC: Fix build issue with webp

The webp variables should only be set if
the libs actually exist in the lib folder

===================================================================

M	build_files/cmake/platform/platform_win32.cmake

===================================================================

diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 9418f74994b..8ae38e03fb1 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -345,10 +345,12 @@ endif()
 
 windows_find_package(WebP)
 if(NOT WEBP_FOUND)
-  set(WEBP_INCLUDE_DIRS ${LIBDIR}/webp/include)
-  set(WEBP_ROOT_DIR ${LIBDIR}/webp)
-  set(WEBP_LIBRARIES ${LIBDIR}/webp/lib/webp.lib ${LIBDIR}/webp/lib/webpdemux.lib ${LIBDIR}/webp/lib/webpmux.lib)
-  set(WEBP_FOUND ON)
+  if(EXISTS ${LIBDIR}/webp)
+    set(WEBP_INCLUDE_DIRS ${LIBDIR}/webp/include)
+    set(WEBP_ROOT_DIR ${LIBDIR}/webp)
+    set(WEBP_LIBRARIES ${LIBDIR}/webp/lib/webp.lib ${LIBDIR}/webp/lib/webpdemux.lib ${LIBDIR}/webp/lib/webpmux.lib)
+    set(WEBP_FOUND ON)
+  endif()
 endif()
 
 if(WITH_OPENCOLLADA)



More information about the Bf-blender-cvs mailing list