simplify CMake for search for OpenEXR package

michaeldsmith · Jan 19, 2025 · 9724640 · 9724640
1 parent 2bcc03a
commit 9724640
Showing 1 changed file with 85 additions and 43 deletions.
diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt
@@ -60,58 +60,100 @@ if( OJPH_ENABLE_OPENEXR_SUPPORT )
   # endif( OpenEXR_FOUND )
 
   #find_package(OpenEXR 3 CONFIG QUIET)
-  find_package(OpenEXR 3 QUIET)
+  #find_package(OpenEXR 3 QUIET)
+  find_package(IlmBase QUIET)
+  if(IlmBase_FOUND)
+    message(STATUS "Found IlmBase ${IlmBase_VERSION}")
+    find_package(OpenEXR 2 QUIET)
+  endif()
+
+  if(NOT OpenEXR_FOUND)
+    #find_package(OpenEXR 3 CONFIG QUIET)
+    find_package(OpenEXR CONFIG QUIET)
+    if(OpenEXR_FOUND)
+      set(OpenEXR_FOUND_WITH_CONFIG TRUE BOOL "found OpenEXR with Config")
+    endif()
+  endif()
+
   if(OpenEXR_FOUND)
     message(STATUS "Found OpenEXR ${OpenEXR_VERSION}")
     set(USE_OPENEXR TRUE CACHE BOOL "Add OpenEXR support")
     add_definitions(-DOJPH_ENABLE_OPENEXR_SUPPORT)
+    if(OpenEXR_FOUND_WITH_CONFIG)
+      message(STATUS " found OpenEXR with Config")
+    else(OpenEXR_FOUND_WITH_CONFIG)
+      message(STATUS " found OpenEXR with FindModule")
+    endif(OpenEXR_FOUND_WITH_CONFIG)
   else(OpenEXR_FOUND)
-    message(STATUS "OpenEXR v3 not found, looking for OpenEXR v2")
-    find_package(IlmBase)
-    if(IlmBase_FOUND)
-      message(STATUS "Found IlmBase ${IlmBase_VERSION}")
-      message(STATUS "       IlmBase_VERSION = ${OpenEXR_VERSION}")
-      message(STATUS "   IlmBase_INCLUDE_DIR = ${OpenEXR_INCLUDE_DIR}")
-      message(STATUS "  IlmBase_INCLUDE_DIRS = ${OpenEXR_INCLUDE_DIRS}")
-      message(STATUS "       IlmBase_LIBRARY = ${OpenEXR_LIBRARY}")
-      message(STATUS "     IlmBase_LIBRARIES = ${OpenEXR_LIBRARIES}")
-      find_package(OpenEXR 2)
-      if(OpenEXR_FOUND)
-        message(STATUS "Found OpenEXR ${OpenEXR_VERSION}")
-        set(USE_OPENEXR TRUE CACHE BOOL "Add OpenEXR support")
-        add_definitions(-DOJPH_ENABLE_OPENEXR_SUPPORT)
-        # if (MSVC)
-        #   # Suffix for debug configuration libraries
-        #   # (if you should choose to install those)
-        #   set(CMAKE_DEBUG_POSTFIX "_d" CACHE STRING "Suffix for debug builds")
-        # endif (MSVC)
-      else(OpenEXR_FOUND)
-        message(STATUS "OpenEXR support has been enabled but no path to the OpenEXR library "
-        "has been specified; please configure with -DCMAKE_PREFIX_PATH=<OpenEXR library directory>, "
-        "or disable OpenEXR support using -DOJPH_ENABLE_OpenEXR_SUPPORT=OFF.")
-      endif(OpenEXR_FOUND)
-    else(IlmBase_FOUND)
-      # try again, but using the CONFIG option
-      find_package(OpenEXR 3 CONFIG QUIET)
-      if(OpenEXR_FOUND)
-        message(STATUS "Found OpenEXR ${OpenEXR_VERSION}")
-        set(USE_OPENEXR TRUE CACHE BOOL "Add OpenEXR support")
-        add_definitions(-DOJPH_ENABLE_OPENEXR_SUPPORT)
-      else(OpenEXR_FOUND)
-        message(STATUS "OpenEXR support has been enabled but no path to the OpenEXR or IlmBase library "
-          "has been specified; please configure with -DCMAKE_PREFIX_PATH=<OpenEXR library directory>, "
-          "or disable OpenEXR support using -DOJPH_ENABLE_OpenEXR_SUPPORT=OFF.")
-      endif(OpenEXR_FOUND)
-    endif(IlmBase_FOUND)
-
+    message(STATUS "OpenEXR support has been enabled but no path to the OpenEXR or IlmBase library "
+      "has been specified; please configure with -DCMAKE_PREFIX_PATH=<OpenEXR library directory>, "
+      "or disable OpenEXR support using -DOJPH_ENABLE_OpenEXR_SUPPORT=OFF.")
   endif(OpenEXR_FOUND)
 
+  if(IlmBase_FOUND)
+    message(STATUS "IlmBase info:")
+    message(STATUS "       IlmBase_VERSION = ${IlmBase_VERSION}")
+    message(STATUS "   IlmBase_INCLUDE_DIR = ${IlmBase_INCLUDE_DIR}")
+    message(STATUS "  IlmBase_INCLUDE_DIRS = ${IlmBase_INCLUDE_DIRS}")
+    message(STATUS "       IlmBase_LIBRARY = ${IlmBase_LIBRARY}")
+    message(STATUS "     IlmBase_LIBRARIES = ${IlmBase_LIBRARIES}")
+  endif(IlmBase_FOUND)
+
+  # if(OpenEXR_FOUND)
+  #   message(STATUS "Found OpenEXR ${OpenEXR_VERSION}")
+  #   find_package(Imath CONFIG)
+  #   set(USE_OPENEXR TRUE CACHE BOOL "Add OpenEXR support")
+  #   add_definitions(-DOJPH_ENABLE_OPENEXR_SUPPORT)
+  # else(OpenEXR_FOUND)
+  #   message(STATUS "OpenEXR v3 not found, looking for OpenEXR v2")
+  #   find_package(IlmBase)
+  #   if(IlmBase_FOUND)
+  #     message(STATUS "Found IlmBase ${IlmBase_VERSION}")
+  #     message(STATUS "       IlmBase_VERSION = ${IlmBase_VERSION}")
+  #     message(STATUS "   IlmBase_INCLUDE_DIR = ${IlmBase_INCLUDE_DIR}")
+  #     message(STATUS "  IlmBase_INCLUDE_DIRS = ${IlmBase_INCLUDE_DIRS}")
+  #     message(STATUS "       IlmBase_LIBRARY = ${IlmBase_LIBRARY}")
+  #     message(STATUS "     IlmBase_LIBRARIES = ${IlmBase_LIBRARIES}")
+  #     find_package(OpenEXR 2)
+  #     if(OpenEXR_FOUND)
+  #       message(STATUS "Found OpenEXR ${OpenEXR_VERSION}")
+  #       set(USE_OPENEXR TRUE CACHE BOOL "Add OpenEXR support")
+  #       add_definitions(-DOJPH_ENABLE_OPENEXR_SUPPORT)
+  #       # if (MSVC)
+  #       #   # Suffix for debug configuration libraries
+  #       #   # (if you should choose to install those)
+  #       #   set(CMAKE_DEBUG_POSTFIX "_d" CACHE STRING "Suffix for debug builds")
+  #       # endif (MSVC)
+  #     else(OpenEXR_FOUND)
+  #       message(STATUS "OpenEXR support has been enabled but no path to the OpenEXR library "
+  #       "has been specified; please configure with -DCMAKE_PREFIX_PATH=<OpenEXR library directory>, "
+  #       "or disable OpenEXR support using -DOJPH_ENABLE_OpenEXR_SUPPORT=OFF.")
+  #     endif(OpenEXR_FOUND)
+  #   else(IlmBase_FOUND)
+  #     # try again, but using the CONFIG option
+  #     find_package(OpenEXR 3 CONFIG QUIET)
+  #     if(OpenEXR_FOUND)
+  #       message(STATUS "Found OpenEXR ${OpenEXR_VERSION}")
+  #       set(USE_OPENEXR TRUE CACHE BOOL "Add OpenEXR support")
+  #       add_definitions(-DOJPH_ENABLE_OPENEXR_SUPPORT)
+  #     else(OpenEXR_FOUND)
+  #       message(STATUS "OpenEXR support has been enabled but no path to the OpenEXR or IlmBase library "
+  #         "has been specified; please configure with -DCMAKE_PREFIX_PATH=<OpenEXR library directory>, "
+  #         "or disable OpenEXR support using -DOJPH_ENABLE_OpenEXR_SUPPORT=OFF.")
+  #     endif(OpenEXR_FOUND)
+  #   endif(IlmBase_FOUND)
+
+  # endif(OpenEXR_FOUND)
+
   if(OpenEXR_FOUND)
+    message(STATUS "OpenEXR info:")
     message(STATUS "       OpenEXR_VERSION = ${OpenEXR_VERSION}")
-    message(STATUS "   OpenEXR_INCLUDE_DIR = ${OpenEXR_INCLUDE_DIR}")
-    message(STATUS "  OpenEXR_INCLUDE_DIRS = ${OpenEXR_INCLUDE_DIRS}")
-    message(STATUS "       OpenEXR_LIBRARY = ${OpenEXR_LIBRARY}")
-    message(STATUS "     OpenEXR_LIBRARIES = ${OpenEXR_LIBRARIES}")
+    if( NOT OpenEXR_FOUND_WITH_CONFIG)
+      message(STATUS "   OpenEXR_INCLUDE_DIR = ${OpenEXR_INCLUDE_DIR}")
+      message(STATUS "  OpenEXR_INCLUDE_DIRS = ${OpenEXR_INCLUDE_DIRS}")
+      message(STATUS "       OpenEXR_LIBRARY = ${OpenEXR_LIBRARY}")
+      message(STATUS "     OpenEXR_LIBRARIES = ${OpenEXR_LIBRARIES}")
+    endif(NOT OpenEXR_FOUND_WITH_CONFIG)
   endif(OpenEXR_FOUND)
 
 endif(OJPH_ENABLE_OPENEXR_SUPPORT)