[Bf-blender-cvs] [7f1e3e7d754] tmp_lib_update_32: Merge branch 'master' into tmp_lib_update_32

[Aaron Carlisle]

Commit: 7f1e3e7d75452086a2df8b6aaf12221d13d47100
Author: Aaron Carlisle
Date:   Thu Mar 24 18:29:22 2022 -0400
Branches: tmp_lib_update_32
https://developer.blender.org/rB7f1e3e7d75452086a2df8b6aaf12221d13d47100

Merge branch 'master' into tmp_lib_update_32

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



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

diff --cc build_files/cmake/platform/platform_win32.cmake
index 557180b78c8,9418f74994b..384598e5605
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@@ -411,25 -412,10 +412,27 @@@ if(WITH_CODEC_FFMPEG
  endif()
  
  if(WITH_IMAGE_OPENEXR)
 -  windows_find_package(OpenEXR REQUIRED)
 +  # Imath and OpenEXR have a single combined build option and include and library variables
 +  # used by the rest of the build system.
 +  set(IMATH_ROOT_DIR ${LIBDIR}/imath)
 +  set(IMATH_VERSION "3.14")
 +  windows_find_package(IMATH REQUIRED)
 +  if(NOT IMATH_FOUND)
 +    set(IMATH ${LIBDIR}/imath)
 +    set(IMATH_INCLUDE_DIR ${IMATH}/include)
 +    set(IMATH_INCLUDE_DIRS ${IMATH_INCLUDE_DIR} ${IMATH}/include/Imath)
 +    set(IMATH_LIBPATH ${IMATH}/lib)
 +    set(IMATH_LIBRARIES
 +      optimized ${IMATH_LIBPATH}/Imath_s.lib
 +      debug ${IMATH_LIBPATH}/Imath_s_d.lib
 +    )
 +  endif()
 +  set(OPENEXR_ROOT_DIR ${LIBDIR}/openexr)
 +  set(OPENEXR_VERSION "3.14")
 +  windows_find_package(OPENEXR REQUIRED)
    if(NOT OPENEXR_FOUND)
+     set(OPENEXR_ROOT_DIR ${LIBDIR}/openexr)
+     set(OPENEXR_VERSION "2.1")
      warn_hardcoded_paths(OpenEXR)
      set(OPENEXR ${LIBDIR}/openexr)
      set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)