diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-01-18 19:03:23 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-01-18 19:03:23 +0400 |
| commit | 90283843e3eebdc651bd7f74f1f0dded8dfa3238 (patch) | |
| tree | 524c5a787f906f01c4f073c632ba2b7a6042ac98 /build_files | |
| parent | 8d0055f3c83644a9f6c2fdd0f5c4da528807904c (diff) | |
install_deps.sh: Fix output conf for CMake (specifying root dirs for OIIO/OCIO is not needed when you use default path, but mandatory otherwise, simpler to always give them).
Spotted by dingto on IRC, thanks!
Diffstat (limited to 'build_files')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 5dc6c51656c..27ee0102d9f 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -2877,12 +2877,24 @@ print_info() { fi fi + if [ -d $INST/ocio ]; then + _1="-D OPENCOLORIO_ROOT_DIR=$INST/ocio" + PRINT " $_1" + _buildargs="$_buildargs $_1" + fi + if [ -d $INST/openexr ]; then _1="-D OPENEXR_ROOT_DIR=$INST/openexr" PRINT " $_1" _buildargs="$_buildargs $_1" fi + if [ -d $INST/oiio ]; then + _1="-D OPENIMAGEIO_ROOT_DIR=$INST/oiio" + PRINT " $_1" + _buildargs="$_buildargs $_1" + fi + _1="-D WITH_CYCLES_OSL=ON" _2="-D WITH_LLVM=ON" _3="-D LLVM_VERSION=$LLVM_VERSION_FOUND" |