[Bf-blender-cvs] [32aebe8c559] tmp-vfx-platform-2023: Merge remote-tracking branch 'origin/master' into tmp-vfx-platform-2023

[Ray Molenkamp]

Commit: 32aebe8c55963d42a6b541e266e85cac25f96311
Author: Ray Molenkamp
Date:   Wed Nov 9 11:29:21 2022 -0700
Branches: tmp-vfx-platform-2023
https://developer.blender.org/rB32aebe8c55963d42a6b541e266e85cac25f96311

Merge remote-tracking branch 'origin/master' into tmp-vfx-platform-2023

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



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

diff --cc build_files/cmake/platform/platform_win32.cmake
index e66824da76d,47673794652..6cbc7656165
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@@ -456,26 -419,38 +456,26 @@@ if(WITH_IMAGE_OPENEXR
      warn_hardcoded_paths(OpenEXR)
      set(OPENEXR ${LIBDIR}/openexr)
      set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
-     set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIRS} ${OPENEXR}/include/OpenEXR)
+     set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIRS} ${OPENEXR_INCLUDE_DIR}/OpenEXR)
      set(OPENEXR_LIBPATH ${OPENEXR}/lib)
 -    # Check if the 3.x library name exists
 -    # if not assume this is a 2.x library folder
 +    # Check if the blender 3.3 lib static library eixts
 +    # if not assume this is a 3.4+ dynamic version.
      if(EXISTS "${OPENEXR_LIBPATH}/OpenEXR_s.lib")
 -      set(OPENEXR_LIBRARIES
 -        optimized ${OPENEXR_LIBPATH}/Iex_s.lib
 -        optimized ${OPENEXR_LIBPATH}/IlmThread_s.lib
 -        optimized ${OPENEXR_LIBPATH}/OpenEXR_s.lib
 -        optimized ${OPENEXR_LIBPATH}/OpenEXRCore_s.lib
 -        optimized ${OPENEXR_LIBPATH}/OpenEXRUtil_s.lib
 -        debug ${OPENEXR_LIBPATH}/Iex_s_d.lib
 -        debug ${OPENEXR_LIBPATH}/IlmThread_s_d.lib
 -        debug ${OPENEXR_LIBPATH}/OpenEXR_s_d.lib
 -        debug ${OPENEXR_LIBPATH}/OpenEXRCore_s_d.lib
 -        debug ${OPENEXR_LIBPATH}/OpenEXRUtil_s_d.lib
 -        ${IMATH_LIBRARIES}
 -      )
 -    else()
 -      set(OPENEXR_LIBRARIES
 -        optimized ${OPENEXR_LIBPATH}/Iex_s.lib
 -        optimized ${OPENEXR_LIBPATH}/Half_s.lib
 -        optimized ${OPENEXR_LIBPATH}/IlmImf_s.lib
 -        optimized ${OPENEXR_LIBPATH}/Imath_s.lib
 -        optimized ${OPENEXR_LIBPATH}/IlmThread_s.lib
 -        debug ${OPENEXR_LIBPATH}/Iex_s_d.lib
 -        debug ${OPENEXR_LIBPATH}/Half_s_d.lib
 -        debug ${OPENEXR_LIBPATH}/IlmImf_s_d.lib
 -        debug ${OPENEXR_LIBPATH}/Imath_s_d.lib
 -        debug ${OPENEXR_LIBPATH}/IlmThread_s_d.lib
 -      )
 +      set(OPENEXR_POSTFIX _s)
      endif()
 +    set(OPENEXR_LIBRARIES
 +      optimized ${OPENEXR_LIBPATH}/Iex${OPENEXR_POSTFIX}.lib
 +      optimized ${OPENEXR_LIBPATH}/IlmThread${OPENEXR_POSTFIX}.lib
 +      optimized ${OPENEXR_LIBPATH}/OpenEXR${OPENEXR_POSTFIX}.lib
 +      optimized ${OPENEXR_LIBPATH}/OpenEXRCore${OPENEXR_POSTFIX}.lib
 +      optimized ${OPENEXR_LIBPATH}/OpenEXRUtil${OPENEXR_POSTFIX}.lib
 +      debug ${OPENEXR_LIBPATH}/Iex${OPENEXR_POSTFIX}_d.lib
 +      debug ${OPENEXR_LIBPATH}/IlmThread${OPENEXR_POSTFIX}_d.lib
 +      debug ${OPENEXR_LIBPATH}/OpenEXR${OPENEXR_POSTFIX}_d.lib
 +      debug ${OPENEXR_LIBPATH}/OpenEXRCore${OPENEXR_POSTFIX}_d.lib
 +      debug ${OPENEXR_LIBPATH}/OpenEXRUtil${OPENEXR_POSTFIX}_d.lib
 +      ${IMATH_LIBRARIES}
 +    )
    endif()
  endif()