diff options
| author | Bastien Montagne <bastien@blender.org> | 2020-12-21 11:49:08 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-12-21 11:49:08 +0300 |
| commit | 720b2c665578d6a5d588e96c0e03c2a5304acd42 (patch) | |
| tree | 294a70442e1ac3885be06b04636fe3a44e7ebbb8 /build_files | |
| parent | fdb7623e098fe431397815fc67667c5904074913 (diff) | |
install-deps: Install OIIO utils, re-enable package on RPMs.
OIIO utils are mandatory for a whole set of tests (Cycles, VSE), and
it's a small package, no reason to not install it.
Also re-enabling package handling of OIIO on RPM-based distro, not sure
why it was disabled but this has become a fairly stable and standard
library now, would not expect issues anymore.
Diffstat (limited to 'build_files')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index c065b48f6ea..671417214d8 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -2086,7 +2086,7 @@ compile_OIIO() { 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" + 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" @@ -4072,7 +4072,7 @@ install_DEB() { else check_package_version_ge_lt_DEB libopenimageio-dev $OIIO_VERSION_MIN $OIIO_VERSION_MAX if [ $? -eq 0 -a "$_with_built_openexr" = false ]; then - install_packages_DEB libopenimageio-dev + install_packages_DEB libopenimageio-dev openimageio-tools clean_OIIO else compile_OIIO @@ -4714,13 +4714,13 @@ install_RPM() { INFO "Forced OpenImageIO building, as requested..." compile_OIIO else - #check_package_version_ge_lt_RPM OpenImageIO-devel $OIIO_VERSION_MIN $OIIO_VERSION_MAX - #if [ $? -eq 0 -a $_with_built_openexr == false ]; then - # install_packages_RPM OpenImageIO-devel - # clean_OIIO - #else + check_package_version_ge_lt_RPM OpenImageIO-devel $OIIO_VERSION_MIN $OIIO_VERSION_MAX + if [ $? -eq 0 -a $_with_built_openexr == false ]; then + install_packages_RPM OpenImageIO-devel OpenImageIO-utils + clean_OIIO + else compile_OIIO - #fi + fi fi |