Skip to content
Snippets Groups Projects
Commit 33b8063b authored by Ankit Meel's avatar Ankit Meel
Browse files

CMake: Remove duplicated code for Haru-TIFF dependency.

parent 038d7275
No related branches found
No related tags found
No related merge requests found
...@@ -731,6 +731,9 @@ set_and_warn_dependency(WITH_OPENVDB WITH_NANOVDB OFF) ...@@ -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. # OpenVDB uses 'half' type from OpenEXR & fails to link without OpenEXR enabled.
set_and_warn_dependency(WITH_IMAGE_OPENEXR WITH_OPENVDB OFF) 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 # auto enable openimageio for cycles
if(WITH_CYCLES) if(WITH_CYCLES)
set(WITH_OPENIMAGEIO ON) set(WITH_OPENIMAGEIO ON)
......
...@@ -434,11 +434,6 @@ if(WITH_HARU) ...@@ -434,11 +434,6 @@ if(WITH_HARU)
message(WARNING "Haru not found, disabling WITH_HARU") message(WARNING "Haru not found, disabling WITH_HARU")
set(WITH_HARU OFF) set(WITH_HARU OFF)
endif() 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() endif()
if(EXISTS ${LIBDIR}) if(EXISTS ${LIBDIR})
......
...@@ -803,11 +803,6 @@ endif() ...@@ -803,11 +803,6 @@ endif()
if(WITH_HARU) if(WITH_HARU)
if(EXISTS ${LIBDIR}/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_FOUND On)
set(HARU_ROOT_DIR ${LIBDIR}/haru) set(HARU_ROOT_DIR ${LIBDIR}/haru)
set(HARU_INCLUDE_DIRS ${HARU_ROOT_DIR}/include) set(HARU_INCLUDE_DIRS ${HARU_ROOT_DIR}/include)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment