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

[Brecht Van Lommel]

Commit: d8d53002942fa042f4ee3e900ca857f982da42e4
Author: Brecht Van Lommel
Date:   Thu Feb 17 16:23:54 2022 +0100
Branches: tmp_lib_update_32
https://developer.blender.org/rBd8d53002942fa042f4ee3e900ca857f982da42e4

Merge branch 'master' into tmp_lib_update_32

Code and find module changes for OpenEXR and OpenImageIO are now in master and
replace the changes in this branch. The WITH_IMATH build option was removed as
Linux and macOS code only use WITH_IMAGE_OPENEXR and there is no immediate
benefit to supporting this separation now.

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



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

diff --cc build_files/cmake/platform/platform_win32.cmake
index 94adf64f226,e2e49ca0bcd..6347ef468b1
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@@ -402,24 -402,9 +402,24 @@@ if(WITH_CODEC_FFMPEG
    endif()
  endif()
  
- if(WITH_IMATH)
+ if(WITH_IMAGE_OPENEXR)
++  # 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-3_1.lib
 +      debug ${IMATH_LIBPATH}/Imath-3_1_d.lib
 +    )
-   endif()
- endif()
- if(WITH_IMAGE_OPENEXR)
++
    set(OPENEXR_ROOT_DIR ${LIBDIR}/openexr)
 -  set(OPENEXR_VERSION "2.1")
 +  set(OPENEXR_VERSION "3.14")
    windows_find_package(OPENEXR REQUIRED)
    if(NOT OPENEXR_FOUND)
      warn_hardcoded_paths(OpenEXR)