diff options
| author | Anthony Edlin <krash> | 2020-04-29 11:14:41 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2020-04-29 11:15:55 +0300 |
| commit | b3ac6d13487291a82a8c0bb5b79b471eb75f9223 (patch) | |
| tree | 55c8e959b04ff64515be41179bd4d723acdba842 /build_files | |
| parent | 601a1a3fdae0bb87f6e6b54b594f0f685a94998a (diff) | |
nstall_deps: USD: Add root usd library directory to build args.
Add root usd library directory to build arguments, same as other libraries.
Also fix error/typo in compile_USD regarding _is_building.
Reviewed By: mont29
Differential Revision: https://developer.blender.org/D7563
Diffstat (limited to 'build_files')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index e8f49c0c75c..6a247e81148 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -2654,7 +2654,7 @@ compile_USD() { cd $CWD INFO "Done compiling USD-$USD_VERSION!" - _is_building=true + _is_building=false else INFO "Own USD-$USD_VERSION is up to date, nothing to do!" INFO "If you want to force rebuild of this lib, use the --force-usd option." @@ -5354,6 +5354,11 @@ print_info() { _1="-D WITH_USD=ON" PRINT " $_1" _buildargs="$_buildargs $_1" + if [ -d $INST/usd ]; then + _1="-D USD_ROOT_DIR=$INST/usd" + PRINT " $_1" + _buildargs="$_buildargs $_1" + fi fi if [ "$NO_SYSTEM_GLEW" = true ]; then |