[Bf-blender-cvs] [3839a4dd848] master: Fix broken Cycles Metal build after recent changes
Brecht Van Lommel
noreply at git.blender.org
Tue Sep 13 13:53:10 CEST 2022
Commit: 3839a4dd84877988bcb6023d1757d6fe36786d19
Author: Brecht Van Lommel
Date: Tue Sep 13 13:49:39 2022 +0200
Branches: master
https://developer.blender.org/rB3839a4dd84877988bcb6023d1757d6fe36786d19
Fix broken Cycles Metal build after recent changes
It was unable to find the Metal framework, thanks to Alaska for tracking
this down.
===================================================================
M build_files/cmake/platform/platform_apple.cmake
===================================================================
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.
More information about the Bf-blender-cvs
mailing list