[Bf-blender-cvs] [e79154de734] master: Fix build error Python module build and Embree on macOS
Brecht Van Lommel
noreply at git.blender.org
Thu Oct 22 18:03:53 CEST 2020
Commit: e79154de73454a450d43744d65c1ce579910f450
Author: Brecht Van Lommel
Date: Thu Oct 22 17:59:08 2020 +0200
Branches: master
https://developer.blender.org/rBe79154de73454a450d43744d65c1ce579910f450
Fix build error Python module build and Embree on macOS
Setting the stack size only works for executables, for shared libraries
the host application controls it.
===================================================================
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 4697e6bc766..d9006297c4d 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -335,7 +335,10 @@ endif()
if(WITH_CYCLES_EMBREE)
find_package(Embree 3.8.0 REQUIRED)
- set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Xlinker -stack_size -Xlinker 0x100000")
+ # Increase stack size for Embree, only works for executables.
+ if(NOT WITH_PYTHON_MODULE)
+ set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Xlinker -stack_size -Xlinker 0x100000")
+ endif()
# Embree static library linking can mix up SSE and AVX symbols, causing
# crashes on macOS systems with older CPUs that don't have AVX. Using
More information about the Bf-blender-cvs
mailing list