blender
/
blender
134
401
Fork 584
Code Issues 6.3k Pull Requests 760 Projects 19 Wiki Activity

CMake: Remove duplicated code for Haru-TIFF dependency.

This commit is contained in:
Ankit Meel 2021-02-02 02:15:40 +05:30
parent 038d72752d
commit 33b8063b1f
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -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)

5
build_files/cmake/platform/platform_apple.cmake
View File

@ -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})

5
build_files/cmake/platform/platform_win32.cmake
View File

@ -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)