[Bf-blender-cvs] [33b8063b1fb] master: CMake: Remove duplicated code for Haru-TIFF dependency.

[Ankit Meel]

Commit: 33b8063b1fb4c96293bdea23509afd26e88ee833
Author: Ankit Meel
Date:   Tue Feb 2 02:15:40 2021 +0530
Branches: master
https://developer.blender.org/rB33b8063b1fb4c96293bdea23509afd26e88ee833

CMake: Remove duplicated code for Haru-TIFF dependency.

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

M	CMakeLists.txt
M	build_files/cmake/platform/platform_apple.cmake
M	build_files/cmake/platform/platform_win32.cmake

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee743b7a5ce..bc19ca4393f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -731,6 +731,9 @@ set_and_warn_dependency(WITH_OPENVDB WITH_NANOVDB       OFF)
 # OpenVDB uses 'half' type from OpenEXR & fails to link without OpenEXR enabled.
 set_and_warn_dependency(WITH_IMAGE_OPENEXR WITH_OPENVDB OFF)
 
+# Haru needs `TIFFFaxBlackCodes` & `TIFFFaxWhiteCodes` symbols from TIFF.
+set_and_warn_dependency(WITH_IMAGE_TIFF WITH_HARU       OFF)
+
 # auto enable openimageio for cycles
 if(WITH_CYCLES)
   set(WITH_OPENIMAGEIO ON)
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index b4f201e1959..09a9a6052d2 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -434,11 +434,6 @@ if(WITH_HARU)
     message(WARNING "Haru not found, disabling WITH_HARU")
     set(WITH_HARU OFF)
   endif()
-  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()
 endif()
 
 if(EXISTS ${LIBDIR})
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index b9e4ec999c9..69a78ba7ca6 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -803,11 +803,6 @@ 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)