[Bf-blender-cvs] [64a4c1a5e9c] temp-sybren-usd-patch-02: USD: added note about upstream pull request for PXR_BUILD_USD_TOOLS
Sybren A. Stüvel
noreply at git.blender.org
Wed Dec 11 16:36:46 CET 2019
Commit: 64a4c1a5e9ce92d50e9bd9d70048679126810a10
Author: Sybren A. Stüvel
Date: Wed Dec 11 11:54:48 2019 +0100
Branches: temp-sybren-usd-patch-02
https://developer.blender.org/rB64a4c1a5e9ce92d50e9bd9d70048679126810a10
USD: added note about upstream pull request for PXR_BUILD_USD_TOOLS
===================================================================
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 4910c32aad5..c3594390f80 100644
--- a/build_files/build_environment/cmake/usd.cmake
+++ b/build_files/build_environment/cmake/usd.cmake
@@ -36,7 +36,11 @@ set(USD_EXTRA_ARGS
-DBUILD_SHARED_LIBS=OFF
-DPYTHON_EXECUTABLE=${PYTHON_BINARY}
-DPXR_BUILD_MONOLITHIC=ON
+
+ # The PXR_BUILD_USD_TOOLS argument is patched-in by usd.diff. An upstream pull request
+ # can be found at https://github.com/PixarAnimationStudios/USD/pull/1048.
-DPXR_BUILD_USD_TOOLS=OFF
+
-DCMAKE_DEBUG_POSTFIX=_d
# USD is hellbound on making a shared lib, unless you point this variable to a valid cmake file
# doesn't have to make sense, but as long as it points somewhere valid it will skip the shared lib.
More information about the Bf-blender-cvs
mailing list