Fix windows build

Author: lilleyse

CMakeLists.txt

@@ -375,15 +375,6 @@ set(CESIUM_OMNI_CXX_DEFINES
     GLM_ENABLE_EXPERIMENTAL
 )
 
-# Boost is a dependency of USD. It is dynamically linked so we need to set this flag.
-set(CESIUM_OMNI_CXX_DEFINES ${CESIUM_OMNI_CXX_DEFINES} BOOST_ALL_DYN_LINK)
-
-# Disable auto-linking
-set(CESIUM_OMNI_CXX_DEFINES ${CESIUM_OMNI_CXX_DEFINES} BOOST_ALL_NO_LIB)
-
-# Hide USD build warning
-set(CESIUM_OMNI_CXX_DEFINES ${CESIUM_OMNI_CXX_DEFINES} BOOST_BIND_GLOBAL_PLACEHOLDERS)
-
 # TBB is a dependency of USD
 if(NOT ${USE_NVIDIA_RELEASE_LIBRARIES})
     set(CESIUM_OMNI_CXX_DEFINES_DEBUG ${CESIUM_OMNI_CXX_DEFINES_DEBUG} TBB_USE_DEBUG)

extern/CMakeLists.txt

@@ -211,12 +211,14 @@ set(PYBIND11_ROOT "${NVIDIA_BUILD_DIR}/target-deps/pybind11")
 set(NVIDIA_USD_LIBRARIES
     usd_ar
     usd_arch
+    usd_boost
     usd_gf
     usd_js
     usd_kind
     usd_ndr
     usd_pcp
     usd_plug
+    usd_python
     usd_sdf
     usd_sdr
     usd_tf
@@ -246,17 +248,6 @@ else()
     set(NVIDIA_USD_DEBUG_LIBRARIES ${NVIDIA_USD_DEBUG_LIBRARIES} tbb)
 endif()
 
-# Add boost python (bundled as usd_boost in Kit SDK 109+)
-set(NVIDIA_USD_TARGET_NAMES ${NVIDIA_USD_TARGET_NAMES} usd_boost)
-
-if(WIN32)
-    set(NVIDIA_USD_RELEASE_LIBRARIES ${NVIDIA_USD_RELEASE_LIBRARIES} usd_boost)
-    set(NVIDIA_USD_DEBUG_LIBRARIES ${NVIDIA_USD_DEBUG_LIBRARIES} usd_boost)
-else()
-    set(NVIDIA_USD_RELEASE_LIBRARIES ${NVIDIA_USD_RELEASE_LIBRARIES} usd_boost)
-    set(NVIDIA_USD_DEBUG_LIBRARIES ${NVIDIA_USD_DEBUG_LIBRARIES} usd_boost)
-endif()
-
 if(${USE_NVIDIA_RELEASE_LIBRARIES})
     set(NVIDIA_USD_DEBUG_LIBRARIES ${NVIDIA_USD_RELEASE_LIBRARIES})
 endif()

extern/nvidia/deps/kit-sdk.packman.xml

@@ -15,10 +15,10 @@
   -->
   <dependency name="omni-ui" linkPath="../_build/target-deps/omni-ui/">
     <package name="omni.ui" version="0e529a493c7b9bf0" platforms="linux-x86_64 manylinux_2_35_x86_64"/>
-    <package name="omni.ui" version="1fbb6da913c9dfa8" platforms="windows-x86_64"/>
+    <package name="omni.ui" version="43dca50bad80e39b" platforms="windows-x86_64"/>
   </dependency>
   <dependency name="omni-kit-renderer-imgui" linkPath="../_build/target-deps/omni-kit-renderer-imgui/">
     <package name="omni.kit.renderer.imgui" version="a5613f69731afb88" platforms="linux-x86_64 manylinux_2_35_x86_64" />
-    <package name="omni.kit.renderer.imgui" version="9bfff9ba25aa72c2" platforms="windows-x86_64" />
+    <package name="omni.kit.renderer.imgui" version="a5caa90b87ca5c10" platforms="windows-x86_64" />
   </dependency>
 </project>

src/core/CMakeLists.txt

@@ -188,12 +188,14 @@ setup_lib(
         fabric
         usd_ar
         usd_arch
+        usd_boost
         usd_gf
         usd_js
         usd_kind
         usd_ndr
         usd_pcp
         usd_plug
+        usd_python
         usd_sdf
         usd_sdr
         usd_tf
@@ -207,7 +209,6 @@ setup_lib(
         usd_usdVol
         usd_vt
         usd_work
-        usd_boost
         tbb
         carb
         omni_kit

src/plugins/CesiumUsdSchemas/CMakeLists.txt

@@ -67,12 +67,13 @@ setup_lib(
         ${SOURCES}
     LIBRARIES
         usd_arch
+        usd_boost
+        usd_python
         usd_sdf
         usd_tf
         usd_usd
         usd_usdGeom
         tbb
-        usd_boost
         python312
     CXX_FLAGS
         ${CESIUM_USD_SCHEMAS_CXX_FLAGS}