[Bf-blender-cvs] [c7f725c1f8e] tmp-vfx-platform-2023: deps: support for dynamic ocio + python bindings

[Ray Molenkamp]

Commit: c7f725c1f8e335ba916fff57f1d1a5200965b984
Author: Ray Molenkamp
Date:   Tue Dec 6 17:46:13 2022 -0700
Branches: tmp-vfx-platform-2023
https://developer.blender.org/rBc7f725c1f8e335ba916fff57f1d1a5200965b984

deps: support for dynamic ocio + python bindings

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

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 4b91f45510d..03132a5a079 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -654,31 +654,25 @@ if(WITH_OPENCOLORIO)
     set(OPENCOLORIO ${LIBDIR}/OpenColorIO)
     set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
     set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib)
-    set(OPENCOLORIO_LIBRARIES
-      optimized ${OPENCOLORIO_LIBPATH}/OpenColorIO.lib
-      optimized ${OPENCOLORIO_LIBPATH}/libexpatMD.lib
-      optimized ${OPENCOLORIO_LIBPATH}/pystring.lib
-      debug ${OPENCOLORIO_LIBPATH}/OpencolorIO_d.lib
-      debug ${OPENCOLORIO_LIBPATH}/libexpatdMD.lib
-      debug ${OPENCOLORIO_LIBPATH}/pystring_d.lib
-    )
-    if(EXISTS ${OPENCOLORIO_LIBPATH}/libyaml-cpp.lib) # 3.4 name
-      list(APPEND OPENCOLORIO_LIBRARIES
+    if(EXISTS ${OPENCOLORIO_LIBPATH}/libexpatMD.lib) # 3.4
+      set(OPENCOLORIO_LIBRARIES
+        optimized ${OPENCOLORIO_LIBPATH}/OpenColorIO.lib
+        optimized ${OPENCOLORIO_LIBPATH}/libexpatMD.lib
+        optimized ${OPENCOLORIO_LIBPATH}/pystring.lib
         optimized ${OPENCOLORIO_LIBPATH}/libyaml-cpp.lib
-        debug ${OPENCOLORIO_LIBPATH}/libyaml-cpp_d.lib
-      )
-    elseif(EXISTS ${OPENCOLORIO_LIBPATH}/yaml-cpp.lib) # 3.5 name
-      list(APPEND OPENCOLORIO_LIBRARIES
-        optimized ${OPENCOLORIO_LIBPATH}/yaml-cpp.lib
-        optimized ${OPENCOLORIO_LIBPATH}/libminizip.lib
+        debug ${OPENCOLORIO_LIBPATH}/OpencolorIO_d.lib
+        debug ${OPENCOLORIO_LIBPATH}/libexpatdMD.lib
+        debug ${OPENCOLORIO_LIBPATH}/pystring_d.lib
         debug ${OPENCOLORIO_LIBPATH}/yaml-cppd.lib
-        debug ${OPENCOLORIO_LIBPATH}/libminizip.lib
       )
+      set(OPENCOLORIO_DEFINITIONS "-DOpenColorIO_SKIP_IMPORTS")
     else()
-      message("FATAL YAML-CPP dependency not found")
+      set(OPENCOLORIO_LIBRARIES
+        optimized ${OPENCOLORIO_LIBPATH}/OpenColorIO.lib
+        debug ${OPENCOLORIO_LIBPATH}/OpencolorIO_d.lib
+      )
     endif()
   endif()
-  set(OPENCOLORIO_DEFINITIONS "-DOpenColorIO_SKIP_IMPORTS")
 endif()
 
 if(WITH_OPENVDB)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 7a393a8ddae..6837bc0da9e 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -493,6 +493,28 @@ if(WITH_OPENCOLORIO)
     DIRECTORY ${CMAKE_SOURCE_DIR}/release/datafiles/colormanagement
     DESTINATION ${TARGETDIR_VER}/datafiles
   )
+  if(WIN32)
+    if(EXISTS ${LIBDIR}/opencolorio/bin/opencolorio_2_2.dll) # 3.5
+      windows_install_shared_manifest(
+        FILES ${LIBDIR}/opencolorio/bin/opencolorio_2_2.dll
+        RELEASE
+      )
+      windows_install_shared_manifest(
+        FILES ${LIBDIR}/opencolorio/bin/opencolorio_d_2_2.dll
+        DEBUG
+      )
+      install(
+        FILES ${LIBDIR}/opencolorio/lib/site-packages-debug/PyOpenColorIO_d.pyd
+        DESTINATION ${TARGETDIR_VER}/python/lib/site-packages
+        CONFIGURATIONS Debug
+      )
+      install(
+        FILES ${LIBDIR}/opencolorio/lib/site-packages/PyOpenColorIO.pyd
+        DESTINATION ${TARGETDIR_VER}/python/lib/site-packages
+        CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
+      )
+    endif()
+  endif()
 endif()
 
 # Helpful tip when using make.