[Bf-blender-cvs] [6121599] master: Update install_deps for recent CMake change

Campbell Barton noreply at git.blender.org
Thu Mar 5 07:46:59 CET 2015


Commit: 61215999b55927a9e12237e0635de56936c07ac3
Author: Campbell Barton
Date:   Thu Mar 5 17:45:21 2015 +1100
Branches: master
https://developer.blender.org/rB61215999b55927a9e12237e0635de56936c07ac3

Update install_deps for recent CMake change

===================================================================

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 45decac..c906542 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -1493,7 +1493,7 @@ compile_OSL() {
     if [ ! -z $LLVM_VERSION_FOUND ]; then
       cmake_d="$cmake_d -D LLVM_VERSION=$LLVM_VERSION_FOUND"
       if [ -d $INST/llvm ]; then
-        cmake_d="$cmake_d -D LLVM_DIRECTORY=$INST/llvm"
+        cmake_d="$cmake_d -D LLVM_ROOT_DIR=$INST/llvm"
         cmake_d="$cmake_d -D LLVM_STATIC=ON"
       fi
     fi
@@ -2997,7 +2997,7 @@ print_info() {
       _buildargs="$_buildargs $_1"
     fi
     if [ -d $INST/llvm ]; then
-      _1="-D LLVM_DIRECTORY=$INST/llvm"
+      _1="-D LLVM_ROOT_DIR=$INST/llvm"
       _2="-D LLVM_STATIC=ON"
       PRINT "  $_1"
       PRINT "  $_2"




More information about the Bf-blender-cvs mailing list