Restore fix to macOS universal 2 build lost from #854 (#1011)

Signed-off-by: Cary Phillips <cary@ilm.com>
AcademySoftwareFoundation · May 17, 2021 · f663390 · f663390
1 parent eeee938
commit f663390
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml
@@ -237,6 +237,8 @@ jobs:
   # ---------------------------------------------------------------------------
   # macOS
   # ---------------------------------------------------------------------------
+  # TODO: Add ARM64/x86_64 (universal 2) build
+
   macos:
     name: 'macOS 10.15 
       <AppleClang 11.0 

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -53,9 +53,6 @@ set(OPENEXR_IMF_HAVE_COMPLETE_IOMANIP TRUE)
 
 if(APPLE)
   set(OPENEXR_IMF_HAVE_DARWIN TRUE)
-  if (${CMAKE_OSX_ARCHITECTURES} MATCHES arm64)
-    set(OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX FALSE)
-  endif()
 endif()
 
 if (OPENEXR_ENABLE_LARGE_STACK)