[Bf-blender-cvs] [3ffe65a7fb9] master: CMake/macOS: Restore TIFF's optional status.
Ankit Meel
noreply at git.blender.org
Fri Oct 16 10:13:10 CEST 2020
Commit: 3ffe65a7fb990836ae389289ae9bd7a675fea980
Author: Ankit Meel
Date: Fri Oct 16 13:11:55 2020 +0530
Branches: master
https://developer.blender.org/rB3ffe65a7fb990836ae389289ae9bd7a675fea980
CMake/macOS: Restore TIFF's optional status.
{rB1f6b7387ad01}
===================================================================
M build_files/cmake/platform/platform_apple.cmake
===================================================================
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index b22adbc68d5..f755c70a859 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -235,8 +235,14 @@ find_package(PNG REQUIRED)
set(JPEG_ROOT ${LIBDIR}/jpeg)
find_package(JPEG REQUIRED)
-set(TIFF_ROOT ${LIBDIR}/tiff)
-find_package(TIFF REQUIRED)
+if(WITH_IMAGE_TIFF)
+ set(TIFF_ROOT ${LIBDIR}/tiff)
+ find_package(TIFF)
+ if(NOT TIFF_FOUND)
+ message(WARNING "TIFF not found, disabling WITH_IMAGE_TIFF")
+ set(WITH_IMAGE_TIFF OFF)
+ endif()
+endif()
if(WITH_BOOST)
set(Boost_NO_BOOST_CMAKE ON)
More information about the Bf-blender-cvs
mailing list