diff options
author | Brecht Van Lommel <brecht@blender.org> | 2021-02-15 19:30:59 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2021-02-15 22:22:34 +0300 |
commit | ae370e292af2f7092db02301e9deb6dd9d7a1441 (patch) | |
tree | 272ebe450b2b93c8a01f3fd2e72fd37f224da792 /build_files/cmake/platform | |
parent | 4ce57f6eb82c0c6d3a23201c8df008d29b18b5f7 (diff) |
macOS: add Embree, OpenImageDenoise and sse2neon libraries for ARM
This required using a fork of Embree, newer LLVM version, unreleased ISPC
version and sse2neon directly from Git. Hopefully over time all the required
changes end up in official releases. For now we deviate from other platforms.
Based on contributions by Apple and Stefan Werner.
Ref D9527, D8237, T78710
Diffstat (limited to 'build_files/cmake/platform')
-rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index b95b21da946..5203ba10863 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -206,6 +206,13 @@ set(PLATFORM_LINKFLAGS list(APPEND PLATFORM_LINKLIBS c++) +if(WITH_OPENIMAGEDENOISE) + if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64") + # OpenImageDenoise uses BNNS from the Accelerate framework. + string(APPEND PLATFORM_LINKFLAGS " -framework Accelerate") + endif() +endif() + if(WITH_JACK) string(APPEND PLATFORM_LINKFLAGS " -F/Library/Frameworks -weak_framework jackmp") endif() @@ -345,12 +352,6 @@ if(WITH_CYCLES_OSL) endif() endif() -if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64") - set(WITH_CYCLES_EMBREE OFF) - set(WITH_OPENIMAGEDENOISE OFF) - set(WITH_CPU_SSE OFF) -endif() - if(WITH_CYCLES_EMBREE) find_package(Embree 3.8.0 REQUIRED) # Increase stack size for Embree, only works for executables. |