Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2021-02-24 17:13:37 +0300
committerRay Molenkamp <github@lazydodo.com>2021-02-24 17:13:37 +0300
commit4fb0c83c1c8529b61d38d8a409caf58d05a53bd9 (patch)
tree18ce99c74a8305a63f93b4ef57a5648818d3352c /intern
parent5be72125bf4dfddf5dfe720caa12b3163f540faf (diff)
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
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/kernel/osl/CMakeLists.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/kernel/osl/CMakeLists.txt b/intern/cycles/kernel/osl/CMakeLists.txt
index cdd3b24be86..6cdc7367fbb 100644
--- a/intern/cycles/kernel/osl/CMakeLists.txt
+++ b/intern/cycles/kernel/osl/CMakeLists.txt
@@ -44,6 +44,7 @@ set(LIB
${OSL_LIBRARIES}
${OPENIMAGEIO_LIBRARIES}
${PUGIXML_LIBRARIES}
+ ${CLANG_LIBRARIES}
${LLVM_LIBRARY}
)