[Bf-blender-cvs] [a2d60933172] tmp_libupdate_34: deps: fix windows usd python install

[Ray Molenkamp]

Commit: a2d609331722d99964f5ba6d6372192b575985e7
Author: Ray Molenkamp
Date:   Fri Aug 5 15:04:37 2022 -0600
Branches: tmp_libupdate_34
https://developer.blender.org/rBa2d609331722d99964f5ba6d6372192b575985e7

deps: fix windows usd python install

The debug/release python folders need to be
separated since there is not easy way to keep
creators installer from grabbing the wrong pyd's
during install.

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

M	build_files/build_environment/cmake/usd.cmake
M	source/creator/CMakeLists.txt

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

diff --git a/build_files/build_environment/cmake/usd.cmake b/build_files/build_environment/cmake/usd.cmake
index 5a34d7584f9..b804a80421b 100644
--- a/build_files/build_environment/cmake/usd.cmake
+++ b/build_files/build_environment/cmake/usd.cmake
@@ -119,7 +119,7 @@ if(WIN32)
   endif()
   if(BUILD_MODE STREQUAL Debug)
     ExternalProject_Add_Step(external_usd after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd/lib/python ${HARVEST_TARGET}/usd/lib/python
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd/lib/python ${HARVEST_TARGET}/usd/lib/debug/python
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/usd/lib/usd_usd_ms_d.dll ${HARVEST_TARGET}/usd/lib/usd_usd_ms_d.dll
       COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/usd/lib/usd_usd_ms_d.lib ${HARVEST_TARGET}/usd/lib/usd_usd_ms_d.lib
       DEPENDEES install
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index a7b61db22a4..62d10b76a34 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -946,12 +946,23 @@ elseif(WIN32)
         install(
           DIRECTORY ${USD_LIBRARY_DIR}/python/
           DESTINATION ${TARGETDIR_VER}/python/lib/site-packages
+          CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
           PATTERN ".svn" EXCLUDE
           PATTERN "__pycache__" EXCLUDE           # * any cache *
           PATTERN "*.pyc" EXCLUDE                 # * any cache *
           PATTERN "*.pyo" EXCLUDE                 # * any cache *
         )
-        unset(_suffix)
+
+        install(
+          DIRECTORY ${USD_LIBRARY_DIR}/debug/python/
+          DESTINATION ${TARGETDIR_VER}/python/lib/site-packages
+          CONFIGURATIONS Debug
+          PATTERN ".svn" EXCLUDE
+          PATTERN "__pycache__" EXCLUDE           # * any cache *
+          PATTERN "*.pyc" EXCLUDE                 # * any cache *
+          PATTERN "*.pyo" EXCLUDE                 # * any cache *
+        )
+
       endif()
 
       if(WINDOWS_PYTHON_DEBUG)