Merge pull request alembic#355 from lgritz/lg-exr2

Fixes to make Alembic exported config work for OpenEXR 2.x or Imath 3.x
LongerVision · Jul 21, 2021 · 6bd2242 · 6bd2242
2 parents b82b487 + c5854c1
commit 6bd2242
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/cmake/AlembicIlmBase.cmake b/cmake/AlembicIlmBase.cmake
@@ -39,10 +39,12 @@ FIND_PACKAGE(Imath)
 IF (Imath_FOUND)
     MESSAGE(STATUS "Found package Imath")
     SET(ALEMBIC_ILMBASE_LIBS Imath::Imath)
+    SET(ALEMBIC_USING_IMATH_3 ON)
 ELSE()
     MESSAGE(STATUS "Could not find Imath looking for IlmBase instead.")
     # What we really want to do is look for libs Imath and half
     FIND_PACKAGE(IlmBase)
+    SET(ALEMBIC_USING_IMATH_3 OFF)
 
     IF (ILMBASE_FOUND)
         SET(ALEMBIC_ILMBASE_FOUND 1 CACHE STRING "Set to 1 if IlmBase is found, 0 otherwise")

diff --git a/lib/Alembic/AlembicConfig.cmake.in b/lib/Alembic/AlembicConfig.cmake.in
@@ -2,7 +2,12 @@
 
 include(CMakeFindDependencyMacro)
 # TODO whenever we loose the back-compatibility with IlmBase < 3, a REQUIRED needs to be added to find_dependency()
-find_dependency(Imath)
+if (@ALEMBIC_USING_IMATH_3@)
+    find_dependency(Imath)
+else ()
+    # Compatibility with OpenEXR 2.x, prior to Imath 3.x
+    find_dependency(IlmBase)
+endif ()
 
 SET(Alembic_HAS_HDF5 @USE_HDF5@)
 SET(Alembic_HAS_SHARED_LIBS @ALEMBIC_SHARED_LIBS@)