Force finding OpenEXR / IlmBase instead of imath for now. --- a/src/cmake/modules/FindOpenEXR.cmake +++ b/src/cmake/modules/FindOpenEXR.cmake @@ -39,43 +39,10 @@ # # First, try to fine just the right config files -find_package(Imath CONFIG) -if (NOT TARGET Imath::Imath) - # Couldn't find Imath::Imath, maybe it's older and has IlmBase? - find_package(IlmBase CONFIG) -endif () +find_package(IlmBase CONFIG) find_package(OpenEXR CONFIG) -if (TARGET OpenEXR::OpenEXR AND TARGET Imath::Imath) - # OpenEXR 3.x if both of these targets are found - set (FOUND_OPENEXR_WITH_CONFIG 1) - if (NOT OpenEXR_FIND_QUIETLY) - message (STATUS "Found CONFIG for OpenEXR 3 (OPENEXR_VERSION=${OpenEXR_VERSION})") - endif () - - # Mimic old style variables - set (OPENEXR_VERSION ${OpenEXR_VERSION}) - get_target_property(IMATH_INCLUDES Imath::Imath INTERFACE_INCLUDE_DIRECTORIES) - get_target_property(ILMBASE_INCLUDES Imath::Imath INTERFACE_INCLUDE_DIRECTORIES) - get_target_property(ILMBASE_IMATH_LIBRARY Imath::Imath INTERFACE_LINK_LIBRARIES) - get_target_property(IMATH_LIBRARY Imath::Imath INTERFACE_LINK_LIBRARIES) - get_target_property(OPENEXR_IEX_LIBRARY OpenEXR::Iex INTERFACE_LINK_LIBRARIES) - get_target_property(OPENEXR_ILMTHREAD_LIBRARY OpenEXR::IlmThread INTERFACE_LINK_LIBRARIES) - set (ILMBASE_LIBRARIES ${ILMBASE_IMATH_LIBRARY}) - set (ILMBASE_FOUND true) - - get_target_property(OPENEXR_INCLUDES OpenEXR::OpenEXR INTERFACE_INCLUDE_DIRECTORIES) - get_target_property(OPENEXR_ILMIMF_LIBRARY OpenEXR::OpenEXR INTERFACE_LINK_LIBRARIES) - set (OPENEXR_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${ILMBASE_LIBRARIES}) - set (OPENEXR_FOUND true) - - # Link with pthreads if required - find_package (Threads) - if (CMAKE_USE_PTHREADS_INIT) - list (APPEND ILMBASE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) - endif () - -elseif (TARGET OpenEXR::IlmImf AND TARGET IlmBase::Imath AND +if (TARGET OpenEXR::IlmImf AND TARGET IlmBase::Imath AND (OPENEXR_VERSION VERSION_GREATER_EQUAL 2.4 OR OpenEXR_VERSION VERSION_GREATER_EQUAL 2.4)) # OpenEXR 2.4 or 2.5 with exported config set (FOUND_OPENEXR_WITH_CONFIG 1)