diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-13 17:09:49 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-13 17:09:49 +0300 |
commit | 03e8de9dae8eebd3c54a076456d58dec813f346e (patch) | |
tree | 26ab08686a5af8b11c116d8a878dc76c32e89191 | |
parent | 379225d2bcd11c93358e4ecbee216318e107b411 (diff) | |
parent | 5c10c92b23cfecb4ea1134ebe33837fb760eb0c9 (diff) |
Merge branch 'master' into blender2.8
-rwxr-xr-x | build_files/build_environment/install_deps.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 7d5ea18aa7e..6c59b1df31d 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -1660,6 +1660,7 @@ compile_OIIO() { cmake_d="$cmake_d -D USE_QT=OFF" cmake_d="$cmake_d -D USE_PYTHON=OFF" cmake_d="$cmake_d -D USE_FFMPEG=OFF" + cmake_d="$cmake_d -D USE_OPENCV=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" |