From fe13b3ad2d12d4e45773bdcb080578e742a74ffc Mon Sep 17 00:00:00 2001
From: Pierre Tremblay <pierre.tremblay@autodesk.com>
Date: Wed, 26 Apr 2023 14:36:04 -0400
Subject: [PATCH 1/3] Separate mtoh .mod file.

---
 CMakeLists.txt                   | 9 +++++++++
 modules/mayaUSD.mod.template     | 7 -------
 modules/mayaUSD_Win.mod.template | 7 -------
 modules/mtoh.mod.template        | 6 ++++++
 modules/mtoh_Win.mod.template    | 6 ++++++
 5 files changed, 21 insertions(+), 14 deletions(-)
 create mode 100644 modules/mtoh.mod.template
 create mode 100644 modules/mtoh_Win.mod.template

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c82afa900b..b5454206a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -243,6 +243,15 @@ if (BUILD_ADSK_PLUGIN)
     install(FILES ${PROJECT_BINARY_DIR}/mayaUSD.mod DESTINATION ${CMAKE_INSTALL_PREFIX})
 endif()
 
+if (BUILD_HDMAYA)
+    if (IS_WINDOWS)
+        configure_file("modules/mtoh_Win.mod.template" ${PROJECT_BINARY_DIR}/mtoh.mod)
+    else()
+        configure_file("modules/mtoh.mod.template" ${PROJECT_BINARY_DIR}/mtoh.mod)
+    endif()
+    install(FILES ${PROJECT_BINARY_DIR}/mtoh.mod DESTINATION ${CMAKE_INSTALL_PREFIX})
+endif()
+
 if (BUILD_PXR_PLUGIN)
     if (IS_WINDOWS)
         configure_file("modules/pxrUSD_Win.mod.template" ${PROJECT_BINARY_DIR}/pxrUSD.mod)
diff --git a/modules/mayaUSD.mod.template b/modules/mayaUSD.mod.template
index 961de8c5d8..69f3ca99c8 100644
--- a/modules/mayaUSD.mod.template
+++ b/modules/mayaUSD.mod.template
@@ -23,10 +23,3 @@ ${MAYAUSD_GTEST_PATH}
 
 + MayaUSD ${MAYAUSD_VERSION} ${CMAKE_INSTALL_PREFIX}/plugin/adsk
 plug-ins: plugin
-
-+ MTOH ${MAYAUSD_VERSION} ${CMAKE_INSTALL_PREFIX}/lib
-icons: 
-plug-ins: maya
-presets: 
-scripts: 
-resources: 
diff --git a/modules/mayaUSD_Win.mod.template b/modules/mayaUSD_Win.mod.template
index b980283e91..ed12ee0171 100644
--- a/modules/mayaUSD_Win.mod.template
+++ b/modules/mayaUSD_Win.mod.template
@@ -31,10 +31,3 @@ ${MAYAUSD_GTEST_PATH}
 
 + MayaUSD ${MAYAUSD_VERSION} ${CMAKE_INSTALL_PREFIX}/plugin/adsk
 plug-ins: plugin
-
-+ MTOH ${MAYAUSD_VERSION} ${CMAKE_INSTALL_PREFIX}/lib
-icons: 
-plug-ins: maya
-presets: 
-scripts: 
-resources: 
diff --git a/modules/mtoh.mod.template b/modules/mtoh.mod.template
new file mode 100644
index 0000000000..c6ba32d916
--- /dev/null
+++ b/modules/mtoh.mod.template
@@ -0,0 +1,6 @@
++ MTOH ${MAYAUSD_VERSION} ${CMAKE_INSTALL_PREFIX}/lib
+icons: 
+plug-ins: maya
+presets: 
+scripts: 
+resources: 
diff --git a/modules/mtoh_Win.mod.template b/modules/mtoh_Win.mod.template
new file mode 100644
index 0000000000..c6ba32d916
--- /dev/null
+++ b/modules/mtoh_Win.mod.template
@@ -0,0 +1,6 @@
++ MTOH ${MAYAUSD_VERSION} ${CMAKE_INSTALL_PREFIX}/lib
+icons: 
+plug-ins: maya
+presets: 
+scripts: 
+resources: 

From 42b0680661e7a491e4059181eaa60aa2e749db0e Mon Sep 17 00:00:00 2001
From: Pierre Tremblay <pierre.tremblay@autodesk.com>
Date: Wed, 26 Apr 2023 14:45:31 -0400
Subject: [PATCH 2/3] Fix clang-format error on existing code.

---
 lib/mayaUsd/ufe/UsdAttribute.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mayaUsd/ufe/UsdAttribute.cpp b/lib/mayaUsd/ufe/UsdAttribute.cpp
index 4c9375b523..238d83266d 100644
--- a/lib/mayaUsd/ufe/UsdAttribute.cpp
+++ b/lib/mayaUsd/ufe/UsdAttribute.cpp
@@ -263,7 +263,7 @@ class SetUndoableCommand : public MayaUsd::ufe::UsdUndoableCommand<Ufe::Undoable
         MayaUsd::ufe::InSetAttribute inSetAttr;
         MayaUsd::ufe::UsdUndoableCommand<Ufe::UndoableCommand>::undo();
     }
-    
+
     void redo() override
     {
         MayaUsd::ufe::InSetAttribute inSetAttr;

From fdd0d7bb411359bde95f1c20969e19d5e886a3d5 Mon Sep 17 00:00:00 2001
From: Pierre Tremblay <pierre.tremblay@autodesk.com>
Date: Thu, 27 Apr 2023 10:30:41 -0400
Subject: [PATCH 3/3] Removed unnecessary Windows version of mtoh.mod.

---
 CMakeLists.txt                | 6 +-----
 modules/mtoh_Win.mod.template | 6 ------
 2 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 modules/mtoh_Win.mod.template

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5454206a2..7aaf71d7c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -244,11 +244,7 @@ if (BUILD_ADSK_PLUGIN)
 endif()
 
 if (BUILD_HDMAYA)
-    if (IS_WINDOWS)
-        configure_file("modules/mtoh_Win.mod.template" ${PROJECT_BINARY_DIR}/mtoh.mod)
-    else()
-        configure_file("modules/mtoh.mod.template" ${PROJECT_BINARY_DIR}/mtoh.mod)
-    endif()
+    configure_file("modules/mtoh.mod.template" ${PROJECT_BINARY_DIR}/mtoh.mod)
     install(FILES ${PROJECT_BINARY_DIR}/mtoh.mod DESTINATION ${CMAKE_INSTALL_PREFIX})
 endif()
 
diff --git a/modules/mtoh_Win.mod.template b/modules/mtoh_Win.mod.template
deleted file mode 100644
index c6ba32d916..0000000000
--- a/modules/mtoh_Win.mod.template
+++ /dev/null
@@ -1,6 +0,0 @@
-+ MTOH ${MAYAUSD_VERSION} ${CMAKE_INSTALL_PREFIX}/lib
-icons: 
-plug-ins: maya
-presets: 
-scripts: 
-resources: