[Bf-blender-cvs] [038d72752d1] master: CMake/Windows: Fix build issue in lite+haru

[Ray Molenkamp]

Commit: 038d72752d19b86c83404966873e7d2205366d38
Author: Ray Molenkamp
Date:   Mon Feb 1 11:35:23 2021 -0700
Branches: master
https://developer.blender.org/rB038d72752d19b86c83404966873e7d2205366d38

CMake/Windows: Fix build issue in lite+haru

Haru depends on some symbols defined in libtiff
which will cause linker errors if not enabled.
Disable haru if WITH_IMAGE_TIFF is off.

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

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 69a78ba7ca6..b9e4ec999c9 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -803,6 +803,11 @@ endif()
 
 if(WITH_HARU)
   if(EXISTS ${LIBDIR}/haru)
+    if(NOT WITH_IMAGE_TIFF)
+      # Some symbols in libharu are provided by libtiff.
+      message(WARNING "WITH_IMAGE_TIFF not enabled, disabling WITH_HARU")
+      set(WITH_HARU OFF)
+    endif()
     set(HARU_FOUND On)
     set(HARU_ROOT_DIR ${LIBDIR}/haru)
     set(HARU_INCLUDE_DIRS ${HARU_ROOT_DIR}/include)