forked from bartvdbraak/blender
CMake: Remove duplicated code for Haru-TIFF dependency.
This commit is contained in:
parent
038d72752d
commit
33b8063b1f
@ -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)
|
||||
|
@ -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})
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user