Merge pull request #4024 from Autodesk/donnels/EMSUSD-1770/initial_su…

…pport_for_usd_24.11_take2 EMSUSD-1770 - Initial support for USD v24.11
Autodesk · Dec 2, 2024 · 31dc37c · 31dc37c
2 parents eaf38d0 + e4ad8e4
commit 31dc37c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 25 deletions.
diff --git 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
@@ -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
@@ -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