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
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-08-23 12:55:58 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-08-23 13:04:54 +0300
commit3d1cb783362722d9567289b150aeaf37573f1393 (patch)
tree822289b467e3ee2d1c9ff8369d1e86b8e59d3d32 /build_files
parent162c320a75b02fcb747ea1b0eab77435396d7e89 (diff)
Fix T69075: OSL build with install_deps.sh failing at runtime
Now uses the same cmake flags as make deps.
Diffstat (limited to 'build_files')
-rwxr-xr-xbuild_files/build_environment/install_deps.sh3
1 files changed, 2 insertions, 1 deletions
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"