From fc6975e218ab515464916b1703dc44ef18eda312 Mon Sep 17 00:00:00 2001
From: Campbell Barton <campbell@blender.org>
Date: Fri, 1 Mar 2024 09:08:14 +1100
Subject: [PATCH] Unbreak build with WITH_IMAGE_OPENEXR disabled on macOS/ARM

[0] was meant to resolve this but the include is still needed event
when OPENEXR is disabled.

[0]: a39c16270ce5c39ead9aa2eee4e9c1cc99071f2e
---
 source/blender/imbuf/CMakeLists.txt            | 18 +++++++++---------
 .../blender/imbuf/intern/oiio/CMakeLists.txt   | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt
index 602fdae530b..72e35d477e2 100644
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -91,15 +91,6 @@ set(LIB
 )
 
 if(WITH_IMAGE_OPENEXR)
-  # Keep until APPLE/ARM libraries are updated.
-  if(APPLE)
-    if(CMAKE_OSX_ARCHITECTURES MATCHES arm64)
-      list(APPEND INC_SYS
-        ${IMATH_INCLUDE_DIRS}
-      )
-    endif()
-  endif()
-
   list(APPEND LIB
     bf_imbuf_openexr
   )
@@ -110,6 +101,15 @@ else()
   )
 endif()
 
+# Keep until APPLE/ARM libraries are updated.
+if(APPLE)
+  if(CMAKE_OSX_ARCHITECTURES MATCHES arm64)
+    list(APPEND INC_SYS
+      ${IMATH_INCLUDE_DIRS}
+    )
+  endif()
+endif()
+
 if(WITH_IMAGE_OPENJPEG)
   list(APPEND INC_SYS
     ${OPENJPEG_INCLUDE_DIRS}
diff --git a/source/blender/imbuf/intern/oiio/CMakeLists.txt b/source/blender/imbuf/intern/oiio/CMakeLists.txt
index e2133efe670..76f9cde7b47 100644
--- a/source/blender/imbuf/intern/oiio/CMakeLists.txt
+++ b/source/blender/imbuf/intern/oiio/CMakeLists.txt
@@ -36,15 +36,6 @@ if(WITH_PUGIXML)
 endif()
 
 if(WITH_IMAGE_OPENEXR)
-  # Keep until APPLE/ARM libraries are updated.
-  if(APPLE)
-    if(CMAKE_OSX_ARCHITECTURES MATCHES arm64)
-      list(APPEND INC_SYS
-        ${IMATH_INCLUDE_DIRS}
-      )
-    endif()
-  endif()
-
   list(APPEND INC_SYS
     ${OPENEXR_INCLUDE_DIRS}
   )
@@ -53,4 +44,13 @@ if(WITH_IMAGE_OPENEXR)
   )
 endif()
 
+# Keep until APPLE/ARM libraries are updated.
+if(APPLE)
+  if(CMAKE_OSX_ARCHITECTURES MATCHES arm64)
+    list(APPEND INC_SYS
+      ${IMATH_INCLUDE_DIRS}
+    )
+  endif()
+endif()
+
 blender_add_lib(bf_imbuf_openimageio "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")