[Bf-blender-cvs] [673df714930] tmp_lib_update_32: Merge remote-tracking branch 'origin/master' into tmp_lib_update_32

[Ray Molenkamp]

Commit: 673df714930db7e8564f50978571aa9449946131
Author: Ray Molenkamp
Date:   Tue Mar 22 07:27:10 2022 -0600
Branches: tmp_lib_update_32
https://developer.blender.org/rB673df714930db7e8564f50978571aa9449946131

Merge remote-tracking branch 'origin/master' into tmp_lib_update_32

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



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

diff --cc build_files/cmake/Modules/FindOpenEXR.cmake
index f772ef4e1ff,f772ef4e1ff..9107b562711
--- a/build_files/cmake/Modules/FindOpenEXR.cmake
+++ b/build_files/cmake/Modules/FindOpenEXR.cmake
@@@ -85,9 -85,9 +85,9 @@@ STRING(REGEX REPLACE "([0-9]+)[.]([0-9]
  IF(OPENEXR_VERSION VERSION_GREATER_EQUAL "3.0.0")
    SET(_openexr_FIND_COMPONENTS
      Iex
--    IlmThread
      OpenEXR
      OpenEXRCore
++    IlmThread
    )
  ELSE()
    SET(_openexr_FIND_COMPONENTS