[Bf-blender-cvs] [9a25c48f08c] master: Build: resolve failure to copy indirect dependencies for USD on Linux

[Campbell Barton]

Commit: 9a25c48f08c8df84062a8c7582379be49ca74655
Author: Campbell Barton
Date:   Fri Dec 16 23:28:28 2022 +1100
Branches: master
https://developer.blender.org/rB9a25c48f08c8df84062a8c7582379be49ca74655

Build: resolve failure to copy indirect dependencies for USD on Linux

Even when building without OpenImageIO and OpenVDB, USD depends on these
libraries.

Ensure these libraries are copied when building with USD.

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

M	build_files/cmake/platform/platform_unix.cmake

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

diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake
index cfb3ecc564b..2b68fa60f15 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -1013,6 +1013,18 @@ endfunction()
 
 configure_atomic_lib_if_needed()
 
+# Handle library inter-dependencies.
+# FIXME: find a better place to handle inter-library dependencies.
+# This is done near the end of the file to ensure bundled libraries are not added multiple times.
+if(WITH_USD)
+  if(NOT WITH_OPENIMAGEIO)
+    add_bundled_libraries(openimageio/lib)
+  endif()
+  if(NOT WITH_OPENVDB)
+    add_bundled_libraries(openvdb/lib)
+  endif()
+endif()
+
 if(PLATFORM_BUNDLED_LIBRARIES)
   # For the installed Python module and installed Blender executable, we set the
   # rpath to the relative path where the install step will copy the shared libraries.