Blender Git Commit Log
Git Commits -> Revision 4fb0c83
Revision 4fb0c83 by Ray molenkamp (master) February 24, 2021, 14:13 (GMT) |
Cmake/deps: Update OSL to 1.11.10.0 This bumps OSL to 1.11.10.0. OSL Has a new build time dependency: Clang, and more importantly it expects clang and llvm to share a library folder, which it previously for us did not. This patch changes: -OSL Update to 1.11.10.0 -refactor the llvm/clang/clang-tools-extra builds into the llvm build using the llvm-project tarball for building that has all of the subprojects in it. -update ispc/openmp builds since clang no longer its own dependency and they have to depend on the llvm build now. -Update the windows builder to use the 64 bit host tools since it ran out of ram linking clang -Since OSL now needs clang to link successfully a findclang.cmake has been provided for linux/OSX Differential Revision: https://developer.blender.org/D10212 Reviewed By: brecht, sebbas, sybren |
Commit Details:
Full Hash: 4fb0c83c1c8529b61d38d8a409caf58d05a53bd9
Parent Commit: 5be7212
Lines Changed: +201, -185
1 Added Path:
/build_files/cmake/Modules/FindClang.cmake (+111, -0) (View)
1 Deleted Path:
/build_files/build_environment/cmake/clang.cmake (+0, -104)
17 Modified Paths:
/build_files/build_environment/cmake/harvest.cmake (+5, -5) (Diff)
/build_files/build_environment/cmake/ispc.cmake (+6, -7) (Diff)
/build_files/build_environment/cmake/llvm.cmake (+21, -0) (Diff)
/build_files/build_environment/cmake/openmp.cmake (+1, -1) (Diff)
/build_files/build_environment/cmake/osl.cmake (+11, -31) (Diff)
/build_files/build_environment/cmake/versions.cmake (+5, -17) (Diff)
/build_files/build_environment/CMakeLists.txt (+0, -1) (Diff)
/build_files/build_environment/patches/llvm.diff (+2, -2) (Diff)
/build_files/build_environment/patches/osl.diff (+10, -14) (Diff)
/build_files/build_environment/windows/build_deps.cmd (+2, -2) (Diff)
/build_files/cmake/platform/platform_apple.cmake (+7, -0) (Diff)
/build_files/cmake/platform/platform_unix.cmake (+10, -1) (Diff)
/build_files/cmake/platform/platform_win32.cmake (+4, -0) (Diff)
/CMakeLists.txt (+3, -0) (Diff)
/intern/cycles/kernel/osl/CMakeLists.txt (+1, -0) (Diff)
/source/creator/blender.map (+1, -0) (Diff)
/source/creator/osx_locals.map (+1, -0) (Diff)
/build_files/build_environment/cmake/ispc.cmake (+6, -7) (Diff)
/build_files/build_environment/cmake/llvm.cmake (+21, -0) (Diff)
/build_files/build_environment/cmake/openmp.cmake (+1, -1) (Diff)
/build_files/build_environment/cmake/osl.cmake (+11, -31) (Diff)
/build_files/build_environment/cmake/versions.cmake (+5, -17) (Diff)
/build_files/build_environment/CMakeLists.txt (+0, -1) (Diff)
/build_files/build_environment/patches/llvm.diff (+2, -2) (Diff)
/build_files/build_environment/patches/osl.diff (+10, -14) (Diff)
/build_files/build_environment/windows/build_deps.cmd (+2, -2) (Diff)
/build_files/cmake/platform/platform_apple.cmake (+7, -0) (Diff)
/build_files/cmake/platform/platform_unix.cmake (+10, -1) (Diff)
/build_files/cmake/platform/platform_win32.cmake (+4, -0) (Diff)
/CMakeLists.txt (+3, -0) (Diff)
/intern/cycles/kernel/osl/CMakeLists.txt (+1, -0) (Diff)
/source/creator/blender.map (+1, -0) (Diff)
/source/creator/osx_locals.map (+1, -0) (Diff)