From 0e4da8d55fdf1ca551566363e515cf2cdf4fa169 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 8 Jan 2024 12:55:26 +0100 Subject: [PATCH] Fix macOS ARM build failing with make lite OpenImageIO headers have a dependency on Imath headers when not on x86_64. --- build_files/cmake/platform/platform_apple.cmake | 5 ++--- intern/cycles/CMakeLists.txt | 1 + source/blender/imbuf/intern/oiio/CMakeLists.txt | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 48be5424187..f8203e94efa 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -154,9 +154,8 @@ if(WITH_FRIBIDI) find_package(Fribidi) endif() -if(WITH_IMAGE_OPENEXR) - find_package(OpenEXR) -endif() +# Header dependency of required OpenImageIO. +find_package(OpenEXR REQUIRED) add_bundled_libraries(openexr/lib) add_bundled_libraries(imath/lib) diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 2047a6fc98a..080d2ef79dc 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -206,6 +206,7 @@ include_directories( SYSTEM ${BOOST_INCLUDE_DIR} ${OPENIMAGEIO_INCLUDE_DIRS} + ${IMATH_INCLUDE_DIRS} ${OPENEXR_INCLUDE_DIRS} ${PUGIXML_INCLUDE_DIR} ) diff --git a/source/blender/imbuf/intern/oiio/CMakeLists.txt b/source/blender/imbuf/intern/oiio/CMakeLists.txt index 3ed76ccd1ea..10a4b36c788 100644 --- a/source/blender/imbuf/intern/oiio/CMakeLists.txt +++ b/source/blender/imbuf/intern/oiio/CMakeLists.txt @@ -11,6 +11,7 @@ set(INC ) set(INC_SYS + ${IMATH_INCLUDE_DIRS} ${OPENIMAGEIO_INCLUDE_DIRS} )