[Bf-blender-cvs] [fd9a1d62f59] master: install_deps: Enable building OIIO tools.

Bastien Montagne noreply at git.blender.org
Wed Dec 21 07:59:04 CET 2022


Commit: fd9a1d62f592a2ed104b8949ce5122d85d295603
Author: Bastien Montagne
Date:   Wed Dec 21 15:58:03 2022 +0900
Branches: master
https://developer.blender.org/rBfd9a1d62f592a2ed104b8949ce5122d85d295603

install_deps: Enable building OIIO tools.

These tools are needed by some unittests doing image comparison e.g.

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

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 c7b4c5930af..ed18e563f14 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -2243,7 +2243,7 @@ compile_OIIO() {
   fi
 
   # To be changed each time we make edits that would modify the compiled result!
-  oiio_magic=18
+  oiio_magic=19
   _init_oiio
 
   # Force having own builds for the dependencies.
@@ -2323,7 +2323,7 @@ compile_OIIO() {
     cmake_d="$cmake_d -D USE_OPENVDB=OFF"
     cmake_d="$cmake_d -D BUILD_TESTING=OFF"
     cmake_d="$cmake_d -D OIIO_BUILD_TESTS=OFF"
-    cmake_d="$cmake_d -D OIIO_BUILD_TOOLS=OFF"
+    cmake_d="$cmake_d -D OIIO_BUILD_TOOLS=ON"
     cmake_d="$cmake_d -D TXT2MAN="
     #cmake_d="$cmake_d -D CMAKE_EXPORT_COMPILE_COMMANDS=ON"
     #cmake_d="$cmake_d -D CMAKE_VERBOSE_MAKEFILE=ON"



More information about the Bf-blender-cvs mailing list