Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
May 7, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/ci_workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,8 @@ jobs:
# ---------------------------------------------------------------------------
# macOS
# ---------------------------------------------------------------------------
# TODO: Add ARM64/x86_64 (universal 2) build

macos:
name: 'macOS 10.15
<AppleClang 11.0
Expand Down
3 changes: 0 additions & 3 deletions cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down