[Bf-blender-cvs] [0355f1c09b5] tmp-vfx-platform-2023: cmake: support building against USD 22.11

[Ray Molenkamp]

Commit: 0355f1c09b5de37894652aba950a25d4c74ad147
Author: Ray Molenkamp
Date:   Fri Oct 28 11:36:17 2022 -0600
Branches: tmp-vfx-platform-2023
https://developer.blender.org/rB0355f1c09b5de37894652aba950a25d4c74ad147

cmake: support building against USD 22.11

===================================================================

M	build_files/cmake/platform/platform_win32.cmake
M	source/creator/CMakeLists.txt

===================================================================

diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 8c645357d6d..9a7f97c2dbe 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -854,14 +854,19 @@ endif()
 if(WITH_USD)
   windows_find_package(USD)
   if(NOT USD_FOUND)
+    # 3.5 22.03 libs
     set(USD_INCLUDE_DIRS ${LIBDIR}/usd/include)
     set(USD_RELEASE_LIB ${LIBDIR}/usd/lib/usd_usd_ms.lib)
     set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/usd_usd_ms_d.lib)
     set(USD_LIBRARY_DIR ${LIBDIR}/usd/lib)
+    if(NOT EXISTS "${USD_RELEASE_LIB}") # 3.5 22.11 libs
+      set(USD_RELEASE_LIB ${LIBDIR}/usd/lib/usd_ms.lib)
+      set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/usd_ms_d.lib)
+    endif()
     # Older USD had different filenames, if the new ones are
     # not found see if the older ones exist, to ease the
     # transition period while landing libs.
-    if(NOT EXISTS "${USD_RELEASE_LIB}")
+    if(NOT EXISTS "${USD_RELEASE_LIB}") # 3.3 static libs
       set(USD_RELEASE_LIB ${LIBDIR}/usd/lib/usd_usd_m.lib)
       set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/usd_usd_m_d.lib)
     endif()
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 8ecca487a2f..4696497fa90 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -1457,7 +1457,7 @@ if(WITH_USD)
     )
   endif()
   if(WIN32)
-    # If this file exists we are building against a 3.4 library folder
+    # If this file exists we are building against a 3.5 22.03 library folder
     # that needs these dll's installed.
     if(EXISTS ${LIBDIR}/usd/lib/usd_usd_ms.dll)
       windows_install_shared_manifest(FILES
@@ -1469,6 +1469,18 @@ if(WITH_USD)
         DEBUG
       )
     endif()
+    # If this file exists we are building against a 3.5 22.11 library folder
+    # that needs these dll's installed.
+    if(EXISTS ${LIBDIR}/usd/lib/usd_ms.dll)
+      windows_install_shared_manifest(FILES
+        ${LIBDIR}/usd/lib/usd_ms.dll
+        RELEASE
+      )
+      windows_install_shared_manifest(FILES
+        ${LIBDIR}/usd/lib/usd_ms_d.dll
+        DEBUG
+      )
+    endif()
   endif()
 endif()