[Bf-blender-cvs] [1274822d089] tmp-ocio-v2: OCIOv2: Update install_deps
Jeroen Bakker
noreply at git.blender.org
Wed Nov 25 15:52:21 CET 2020
Commit: 1274822d0894506d30db139c869927cdf52b9af3
Author: Jeroen Bakker
Date: Wed Nov 25 15:46:38 2020 +0100
Branches: tmp-ocio-v2
https://developer.blender.org/rB1274822d0894506d30db139c869927cdf52b9af3
OCIOv2: Update install_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 c065b48f6ea..db2a0a4a2ba 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -419,10 +419,10 @@ TBB_FORCE_BUILD=false
TBB_FORCE_REBUILD=false
TBB_SKIP=false
-OCIO_VERSION="1.1.1"
-OCIO_VERSION_SHORT="1.1"
-OCIO_VERSION_MIN="1.0"
-OCIO_VERSION_MAX="1.2"
+OCIO_VERSION="2.0.0-beta1"
+OCIO_VERSION_SHORT="2.0"
+OCIO_VERSION_MIN="2.0"
+OCIO_VERSION_MAX="2.0"
OCIO_FORCE_BUILD=false
OCIO_FORCE_REBUILD=false
OCIO_SKIP=false
@@ -1808,8 +1808,8 @@ compile_OCIO() {
cmake_d="$cmake_d -D CMAKE_PREFIX_PATH=$_inst"
cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst"
cmake_d="$cmake_d -D OCIO_BUILD_APPS=OFF"
- cmake_d="$cmake_d -D OCIO_BUILD_PYGLUE=OFF"
- cmake_d="$cmake_d -D STOP_ON_WARNING=OFF"
+ cmake_d="$cmake_d -D OCIO_BUILD_PYTHON=OFF"
+ cmake_d="$cmake_d -D OCIO_BUILD_GPU_TESTS=OFF"
if file /bin/cp | grep -q '32-bit'; then
cflags="-fPIC -m32 -march=i686"
More information about the Bf-blender-cvs
mailing list