From 73c88804c1d98396212e429555c3aed83e542584 Mon Sep 17 00:00:00 2001
From: Zhicheng Ye <Zhicheng.Ye@al.com.au>
Date: Fri, 24 Sep 2021 15:33:17 +1000
Subject: [PATCH 1/5] Fixed cmake variable name for schema headers

---
 lib/usd/schemas/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/usd/schemas/CMakeLists.txt b/lib/usd/schemas/CMakeLists.txt
index dbd59ce801..bb112c0197 100644
--- a/lib/usd/schemas/CMakeLists.txt
+++ b/lib/usd/schemas/CMakeLists.txt
@@ -106,7 +106,7 @@ if(IS_WINDOWS)
     install(FILES $<TARGET_PDB_FILE:${TARGET_NAME}> DESTINATION ${CMAKE_INSTALL_PREFIX}/lib OPTIONAL)
 endif()
 
-install(FILES ${headers}
+install(FILES ${HEADERS}
         DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${TARGET_NAME}
 )
 

From e066d023369c33644028b9b5a01d7cd1a3b0112f Mon Sep 17 00:00:00 2001
From: Zhicheng Ye <Zhicheng.Ye@al.com.au>
Date: Thu, 28 Jan 2021 14:48:16 +1100
Subject: [PATCH 2/5] Added public headers installation for
 pxrUsdPreviewSurface

---
 lib/usd/pxrUsdPreviewSurface/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/usd/pxrUsdPreviewSurface/CMakeLists.txt b/lib/usd/pxrUsdPreviewSurface/CMakeLists.txt
index c47a604780..2a72ff2e48 100644
--- a/lib/usd/pxrUsdPreviewSurface/CMakeLists.txt
+++ b/lib/usd/pxrUsdPreviewSurface/CMakeLists.txt
@@ -105,6 +105,10 @@ endif()
 #------------------------------------------------------------------------------
 # install
 #------------------------------------------------------------------------------
+install(FILES api.h usdPreviewSurface.h usdPreviewSurfacePlugin.h
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${TARGET_NAME}
+)
+
 install(
     TARGETS ${TARGET_NAME}
     LIBRARY

From bd8e0b872aa5bc4c4ecce29d3f6103a2d6d7b27b Mon Sep 17 00:00:00 2001
From: Zhicheng Ye <Zhicheng.Ye@al.com.au>
Date: Wed, 31 Mar 2021 10:20:37 +1100
Subject: [PATCH 3/5] Fixed compilation issue if HDVP2_ENABLE_GPU_OSD enabled

---
 lib/mayaUsd/render/vp2RenderDelegate/meshViewportCompute.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/mayaUsd/render/vp2RenderDelegate/meshViewportCompute.cpp b/lib/mayaUsd/render/vp2RenderDelegate/meshViewportCompute.cpp
index 33b6806324..a82dbf737a 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/meshViewportCompute.cpp
+++ b/lib/mayaUsd/render/vp2RenderDelegate/meshViewportCompute.cpp
@@ -22,14 +22,15 @@
 #include <mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h>
 
 #include <pxr/imaging/hd/vertexAdjacency.h>
-#include <pxr/imaging/pxOsd/refinerFactory.h>
-#include <pxr/imaging/pxOsd/tokens.h>
 #include <pxr/pxr.h>
 
 #include <maya/MProfiler.h>
 
 #ifdef HDVP2_ENABLE_GPU_COMPUTE
 
+#include <pxr/imaging/pxOsd/refinerFactory.h>
+#include <pxr/imaging/pxOsd/tokens.h>
+
 PXR_NAMESPACE_OPEN_SCOPE
 
 namespace {

From a0960433dfdf5f0d9d7a350ce6ae5c636954e4ab Mon Sep 17 00:00:00 2001
From: Zhicheng Ye <Zhicheng.Ye@al.com.au>
Date: Thu, 1 Apr 2021 16:10:02 +1100
Subject: [PATCH 4/5] Fixed missing UFE include for PXR_USDMaya for maya-2022

---
 plugin/pxr/maya/lib/usdMaya/CMakeLists.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugin/pxr/maya/lib/usdMaya/CMakeLists.txt b/plugin/pxr/maya/lib/usdMaya/CMakeLists.txt
index c440aad9c4..35fe3249e9 100644
--- a/plugin/pxr/maya/lib/usdMaya/CMakeLists.txt
+++ b/plugin/pxr/maya/lib/usdMaya/CMakeLists.txt
@@ -17,9 +17,11 @@ pxr_shared_library(${PXR_PACKAGE}
         ${MAYA_OpenMayaRender_LIBRARY}
         ${MAYA_OpenMayaUI_LIBRARY}
         mayaUsd
+        $<$<BOOL:${UFE_FOUND}>:${UFE_LIBRARY}>
 
     INCLUDE_DIRS
         ${MAYA_INCLUDE_DIRS}
+        $<$<BOOL:${UFE_FOUND}>:${UFE_INCLUDE_DIR}>
 
     PUBLIC_HEADERS
         api.h
@@ -64,6 +66,10 @@ pxr_shared_library(${PXR_PACKAGE}
     DISABLE_PRECOMPILED_HEADERS
 )
 
+if (UFE_FOUND)
+    target_compile_definitions(${PXR_PACKAGE} PRIVATE WANT_UFE_BUILD)
+endif()
+
 pxr_test_scripts(
         testenv/testUsdExportAssembly.py
         testenv/testUsdExportAssemblyEdits.py

From 6b27610d5ada2b757461678b26c4e22e0999aea5 Mon Sep 17 00:00:00 2001
From: Zhicheng Ye <Zhicheng.Ye@al.com.au>
Date: Wed, 29 Sep 2021 12:23:08 +1000
Subject: [PATCH 5/5] Improved handling macro HDVP2_ENABLE_GPU_COMPUTE in
 source file

---
 .../render/vp2RenderDelegate/meshViewportCompute.cpp     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/mayaUsd/render/vp2RenderDelegate/meshViewportCompute.cpp b/lib/mayaUsd/render/vp2RenderDelegate/meshViewportCompute.cpp
index a82dbf737a..d68db873c5 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/meshViewportCompute.cpp
+++ b/lib/mayaUsd/render/vp2RenderDelegate/meshViewportCompute.cpp
@@ -16,21 +16,20 @@
 
 #include "meshViewportCompute.h"
 
+#ifdef HDVP2_ENABLE_GPU_COMPUTE
+
 #include "mesh.h"
 #include "render_delegate.h"
 
 #include <mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h>
 
 #include <pxr/imaging/hd/vertexAdjacency.h>
+#include <pxr/imaging/pxOsd/refinerFactory.h>
+#include <pxr/imaging/pxOsd/tokens.h>
 #include <pxr/pxr.h>
 
 #include <maya/MProfiler.h>
 
-#ifdef HDVP2_ENABLE_GPU_COMPUTE
-
-#include <pxr/imaging/pxOsd/refinerFactory.h>
-#include <pxr/imaging/pxOsd/tokens.h>
-
 PXR_NAMESPACE_OPEN_SCOPE
 
 namespace {