[Bf-blender-cvs] [7a4a2ed] master: intsall_deps / OSL use c++11 ABI when install_deps is asking for c++11

Martijn Berger noreply at git.blender.org
Mon Nov 14 09:59:38 CET 2016


Commit: 7a4a2ed5f4086b488e9bc03ab32a79f6f8322c02
Author: Martijn Berger
Date:   Mon Nov 14 09:59:30 2016 +0100
Branches: master
https://developer.blender.org/rB7a4a2ed5f4086b488e9bc03ab32a79f6f8322c02

intsall_deps / OSL use c++11 ABI when install_deps is asking for c++11

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

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 7844ff5..5a02a96 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -1858,6 +1858,9 @@ 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"
+    if [ "$USE_CXX11" = true ]; then
+        cmake_d="$cmake_d -D OSL_BUILD_CPP11=1"
+    fi
 
     #~ cmake_d="$cmake_d -D ILMBASE_VERSION=$ILMBASE_VERSION"




More information about the Bf-blender-cvs mailing list