From e4ad8e4309d1f7b87883f4fea1c284d3de708d6f Mon Sep 17 00:00:00 2001
From: Sean Donnelly <23455376+seando-adsk@users.noreply.github.com>
Date: Mon, 2 Dec 2024 14:14:11 -0500
Subject: [PATCH] EMSUSD-1770 - Initial support for USD v24.11 * Revert mistake
 made in previous commit related to   boost cmake flags.

---
 lib/mayaUsd/CMakeLists.txt    | 10 ++--------
 lib/mayaUsdAPI/CMakeLists.txt | 11 +++--------
 lib/usdUfe/CMakeLists.txt     | 12 +++---------
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/lib/mayaUsd/CMakeLists.txt b/lib/mayaUsd/CMakeLists.txt
index ab3ac95107..6d6529d765 100644
--- a/lib/mayaUsd/CMakeLists.txt
+++ b/lib/mayaUsd/CMakeLists.txt
@@ -24,6 +24,8 @@ target_compile_definitions(${PROJECT_NAME}
     PUBLIC
         PXR_PLUGINPATH_NAME=${PXR_OVERRIDE_PLUGINPATH_NAME}
         $<$<STREQUAL:${CMAKE_BUILD_TYPE},Debug>:TBB_USE_DEBUG>
+        $<$<STREQUAL:${CMAKE_BUILD_TYPE},Debug>:BOOST_DEBUG_PYTHON>
+        $<$<STREQUAL:${CMAKE_BUILD_TYPE},Debug>:BOOST_LINKING_PYTHON>
         $<$<BOOL:${CMAKE_WANT_VALIDATE_UNDO_ITEM}>:WANT_VALIDATE_UNDO_ITEM>
         $<$<BOOL:${MAYA_ENABLE_NEW_PRIM_DELETE}>:MAYA_ENABLE_NEW_PRIM_DELETE>
     PRIVATE
@@ -44,14 +46,6 @@ target_compile_definitions(${PROJECT_NAME}
         $<$<BOOL:${IS_WINDOWS}>:WIN32>
 )
 
-if (USD_VERSION VERSION_LESS "0.24.11")
-    target_compile_definitions(${PROJECT_NAME}
-        PUBLIC
-            $<$<STREQUAL:${CMAKE_BUILD_TYPE},Debug>:BOOST_DEBUG_PYTHON>
-            $<$<STREQUAL:${CMAKE_BUILD_TYPE},Debug>:BOOST_LINKING_PYTHON>
-    )
-endif()
-
 if(DEFINED UFE_PREVIEW_VERSION_NUM)
     target_compile_definitions(${PROJECT_NAME}
         PUBLIC
diff --git a/lib/mayaUsdAPI/CMakeLists.txt b/lib/mayaUsdAPI/CMakeLists.txt
index 81c92334ca..5d0114272c 100644
--- a/lib/mayaUsdAPI/CMakeLists.txt
+++ b/lib/mayaUsdAPI/CMakeLists.txt
@@ -63,6 +63,9 @@ endif()
 # compiler configuration
 # -----------------------------------------------------------------------------
 target_compile_definitions(${PROJECT_NAME} 
+    PUBLIC
+        $<$<STREQUAL:${CMAKE_BUILD_TYPE},Debug>:BOOST_DEBUG_PYTHON>
+        $<$<STREQUAL:${CMAKE_BUILD_TYPE},Debug>:BOOST_LINKING_PYTHON>
     PRIVATE
         MAYAUSD_API_EXPORT
         MFB_PACKAGE_NAME="${PROJECT_NAME}"
@@ -75,14 +78,6 @@ target_compile_definitions(${PROJECT_NAME}
         $<$<BOOL:${IS_WINDOWS}>:WIN32>
 )
 
-if (USD_VERSION VERSION_LESS "0.24.11")
-    target_compile_definitions(${PROJECT_NAME}
-        PUBLIC
-            $<$<STREQUAL:${CMAKE_BUILD_TYPE},Debug>:BOOST_DEBUG_PYTHON>
-            $<$<STREQUAL:${CMAKE_BUILD_TYPE},Debug>:BOOST_LINKING_PYTHON>
-    )
-endif()
-
 # When the cmake var is set also set another cmake var for the corresponding
 # define. So in mayaUsdAPI.h.src we can configure it correctly. This is used
 # when building the MayaUsdAPI project and for any clients that are using it.
diff --git a/lib/usdUfe/CMakeLists.txt b/lib/usdUfe/CMakeLists.txt
index 4600fa7f7c..c8070e33a2 100644
--- a/lib/usdUfe/CMakeLists.txt
+++ b/lib/usdUfe/CMakeLists.txt
@@ -25,6 +25,9 @@ add_library(${PROJECT_NAME} SHARED)
 # -----------------------------------------------------------------------------
 target_compile_definitions(${PROJECT_NAME}
     PUBLIC
+        $<$<STREQUAL:${CMAKE_BUILD_TYPE},Debug>:TBB_USE_DEBUG>
+        $<$<STREQUAL:${CMAKE_BUILD_TYPE},Debug>:BOOST_DEBUG_PYTHON>
+        $<$<STREQUAL:${CMAKE_BUILD_TYPE},Debug>:BOOST_LINKING_PYTHON>
         $<$<BOOL:${MAYA_ENABLE_NEW_PRIM_DELETE}>:MAYA_ENABLE_NEW_PRIM_DELETE>
     PRIVATE
         USDUFE_EXPORT
@@ -38,15 +41,6 @@ target_compile_definitions(${PROJECT_NAME}
         $<$<BOOL:${IS_WINDOWS}>:WIN32>
 )
 
-if (USD_VERSION VERSION_LESS "0.24.11")
-    target_compile_definitions(${PROJECT_NAME}
-        PUBLIC
-            $<$<STREQUAL:${CMAKE_BUILD_TYPE},Debug>:BOOST_DEBUG_PYTHON>
-            $<$<STREQUAL:${CMAKE_BUILD_TYPE},Debug>:BOOST_LINKING_PYTHON>
-    )
-endif()
-
-
 if(DEFINED UFE_PREVIEW_VERSION_NUM)
     target_compile_definitions(${PROJECT_NAME}
         PUBLIC