Temp

Author: lilleyse

extern/CMakeLists.txt

@@ -241,11 +241,14 @@ set(NVIDIA_USD_DEBUG_LIBRARIES ${NVIDIA_USD_LIBRARIES})
 
 # Add TBB
 set(NVIDIA_USD_TARGET_NAMES ${NVIDIA_USD_TARGET_NAMES} tbb)
-set(NVIDIA_USD_RELEASE_LIBRARIES ${NVIDIA_USD_RELEASE_LIBRARIES} tbb)
 
 if(WIN32)
-    set(NVIDIA_USD_DEBUG_LIBRARIES ${NVIDIA_USD_DEBUG_LIBRARIES} tbb_debug)
+    # Kit 110 ships oneTBB as tbb12.lib / tbb12.dll (tbb.dll does not exist).
+    # The CMake target is still named `tbb`; only the underlying lib/DLL is versioned.
+    set(NVIDIA_USD_RELEASE_LIBRARIES ${NVIDIA_USD_RELEASE_LIBRARIES} tbb12)
+    set(NVIDIA_USD_DEBUG_LIBRARIES ${NVIDIA_USD_DEBUG_LIBRARIES} tbb12)
 else()
+    set(NVIDIA_USD_RELEASE_LIBRARIES ${NVIDIA_USD_RELEASE_LIBRARIES} tbb)
     set(NVIDIA_USD_DEBUG_LIBRARIES ${NVIDIA_USD_DEBUG_LIBRARIES} tbb)
 endif()
 

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

@@ -14,11 +14,11 @@
   [omni.kit.registry.nucleus] [tid: 140737352547200] downloading: 'http://d4i3qtqj3r0z5.cloudfront.net/omni.kit.renderer.imgui-61a6e663a4d57772.zip' -> '/tmp/tmpi1uqvpk1/omni.kit.renderer.imgui-1.0.2+d02c707b.lx64.r.cp310.zip'...
   -->
   <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="43dca50bad80e39b" platforms="windows-x86_64"/>
+    <package name="omni.ui" version="5df11c6deaa3f809" platforms="linux-x86_64 manylinux_2_35_x86_64"/>
+    <package name="omni.ui" version="19feb74a05aa1a38" 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="a5caa90b87ca5c10" platforms="windows-x86_64" />
+    <package name="omni.kit.renderer.imgui" version="de82f3e2950efdf0" platforms="linux-x86_64 manylinux_2_35_x86_64" />
+    <package name="omni.kit.renderer.imgui" version="704f5472fcd3d688" platforms="windows-x86_64" />
   </dependency>
 </project>

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="5df11c6deaa3f809" platforms="linux-x86_64 manylinux_2_35_x86_64"/>
-    <package name="omni.ui" version="43dca50bad80e39b" platforms="windows-x86_64"/>
+    <package name="omni.ui" version="19feb74a05aa1a38" 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="de82f3e2950efdf0" platforms="linux-x86_64 manylinux_2_35_x86_64" />
-    <package name="omni.kit.renderer.imgui" version="a5caa90b87ca5c10" platforms="windows-x86_64" />
+    <package name="omni.kit.renderer.imgui" version="704f5472fcd3d688" platforms="windows-x86_64" />
   </dependency>
 </project>

vcpkg/triplets/x64-windows-omniverse.cmake

@@ -7,3 +7,8 @@ set(VCPKG_LIBRARY_LINKAGE static)
 # Techically we should be setting /MDd if USE_NVIDIA_RELEASE_LIBRARIES is false
 set(VCPKG_CXX_FLAGS "/MD /EHsc -D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
 set(VCPKG_C_FLAGS "${VCPKG_CXX_FLAGS}")
+
+# CMake 4.x removed compatibility with cmake_minimum_required(<3.5); some ports
+# (e.g. asyncplusplus) still declare it. Allow them to configure anyway.
+set(VCPKG_CMAKE_CONFIGURE_OPTIONS "-DCMAKE_POLICY_VERSION_MINIMUM=3.5")
+