Commit: 3d1cb783362722d9567289b150aeaf37573f1393
Author: Brecht Van Lommel
Date: Fri Aug 23 11:55:58 2019 +0200
Branches: master
https://developer.blender.org/rB3d1cb783362722d9567289b150aeaf37573f1393
Fix T69075: OSL build with install_deps.sh failing at runtime
Now uses the same cmake flags as make deps.
===================================================================
M build_files/build_environment/install_deps.sh
===================================================================
diff --git a/build_files/build_environment/install_deps.sh
b/build_files/build_environment/install_deps.sh
index a9118be93c7..ddc896725eb 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -1974,7 +1974,8 @@ compile_OSL() {
cmake_d="$cmake_d -D OSL_BUILD_PLUGINS=OFF"
cmake_d="$cmake_d -D OSL_BUILD_TESTS=OFF"
cmake_d="$cmake_d -D USE_SIMD=sse2"
- cmake_d="$cmake_d -D OSL_BUILD_CPP11=1"
+ cmake_d="$cmake_d -D USE_LLVM_BITCODE=OFF"
+ cmake_d="$cmake_d -D USE_PARTIO=OFF"
#~ cmake_d="$cmake_d -D ILMBASE_VERSION=$ILMBASE_VERSION"
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
