diff options
author | Brecht Van Lommel <brecht@blender.org> | 2022-09-13 14:49:39 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2022-09-13 14:52:14 +0300 |
commit | 3839a4dd84877988bcb6023d1757d6fe36786d19 (patch) | |
tree | 9d8937d968526e9e9db3f6d8fe08d04190d22f90 | |
parent | 62cee2400348e815105821864970e46142c82d18 (diff) |
Fix broken Cycles Metal build after recent changes
It was unable to find the Metal framework, thanks to Alaska for tracking
this down.
-rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index e428b2abab3..f2a8bd42a3e 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -36,7 +36,8 @@ endmacro() # ------------------------------------------------------------------------ # Find system provided libraries. -# Avoid searching for headers in frameworks (like Mono), and libraries in LIBDIR. +# Avoid searching for headers since this would otherwise override our lib +# directory as well as PYTHON_ROOT_DIR. set(CMAKE_FIND_FRAMEWORK NEVER) # Find system ZLIB, not the pre-compiled one supplied with OpenCollada. @@ -439,6 +440,9 @@ if(EXISTS ${LIBDIR}) without_system_libs_end() endif() +# Restore to default. +set(CMAKE_FIND_FRAMEWORK FIRST) + # --------------------------------------------------------------------- # Set compiler and linker flags. |