diff options
| author | Hans Goudey <h.goudey@me.com> | 2021-02-02 16:47:09 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2021-02-02 16:47:09 +0300 |
| commit | 7746c562a4543ee34cca7ec78302317231741d82 (patch) | |
| tree | b3971266d92f796564d293769a0f1defedbce668 | |
| parent | 525d36813cae2c14238f5e44d69ec4d81eb18dd1 (diff) | |
| parent | 33b8063b1fb4c96293bdea23509afd26e88ee833 (diff) | |
Merge branch 'master' into temp-geometry-nodes-instances-api
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 5 |
2 files changed, 3 insertions, 5 deletions
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}) |