[Bf-blender-cvs] [918afc838eb] temp-sybren-usd-patch-02: USD: Avoid potential conflict with 2nd USD library

[Sybren A. Stüvel]

Commit: 918afc838eb8a5b6392bfe0063d2abc4368132c1
Author: Sybren A. Stüvel
Date:   Wed Dec 11 11:50:28 2019 +0100
Branches: temp-sybren-usd-patch-02
https://developer.blender.org/rB918afc838eb8a5b6392bfe0063d2abc4368132c1

USD: Avoid potential conflict with 2nd USD library

We now build the USD library with
`-DPXR_SET_INTERNAL_NAMESPACE=usdBlender`, which replaces the default
namespace `pxrInternal_v_x_y` with `usdBlender`. This is a preventative
measure that avoids possible conflicts when add-ons try to load another
USD library into the same process space.

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

M	build_files/build_environment/cmake/usd.cmake

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

diff --git a/build_files/build_environment/cmake/usd.cmake b/build_files/build_environment/cmake/usd.cmake
index f9803b93967..4910c32aad5 100644
--- a/build_files/build_environment/cmake/usd.cmake
+++ b/build_files/build_environment/cmake/usd.cmake
@@ -25,6 +25,11 @@ set(USD_EXTRA_ARGS
   -DTBB_INCLUDE_DIRS=${LIBDIR}/tbb/include
   -DTBB_LIBRARIES=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
   -DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
+
+  # This is a preventative measure that avoids possible conflicts when add-ons
+  # try to load another USD library into the same process space.
+  -DPXR_SET_INTERNAL_NAMESPACE=usdBlender
+
   -DPXR_ENABLE_PYTHON_SUPPORT=OFF
   -DPXR_BUILD_IMAGING=OFF
   -DPXR_BUILD_TESTS=OFF