clean up CMakeLists

Author: michaeldsmith

src/apps/CMakeLists.txt

@@ -29,46 +29,13 @@ endif(OJPH_ENABLE_TIFF_SUPPORT)
 ############################################################
 if( OJPH_ENABLE_OPENEXR_SUPPORT )
 
-  # FIND_PACKAGE( Imath )
-
-  # if( Imath_FOUND )
-  #   message(STATUS "Found Imath ${Imath_VERSION}")
-  #   message(STATUS "      Imath_INCLUDE_DIR = ${Imath_INCLUDE_DIR}")
-  #   message(STATUS "      Imath_INCLUDE_DIRS = ${Imath_INCLUDE_DIRS}")
-  #   message(STATUS "      Imath_LIBRARY = ${Imath_LIBRARY}")
-  #   message(STATUS "      Imath_LIBRARIES = ${Imath_LIBRARIES}")
-  #   include_directories( ${Imath_INCLUDE_DIR} ) 
-  # else()
-  #   message(STATUS "Imath support has been enabled but no path to the Imath library "
-  #   "has been specified; please configure with -DCMAKE_PREFIX_PATH=<Imath library directory>, "
-  #   "or disable OpenEXR support using -DOJPH_ENABLE_OPENEXR_SUPPORT=OFF.")
-  # endif( Imath_FOUND )
-
-  # FIND_PACKAGE( OpenEXR )
-
-  # if( OpenEXR_FOUND )
-  #   message(STATUS "Found OpenEXR ${OpenEXR_VERSION}")
-  #   message(STATUS "      OpenEXR_INCLUDE_DIR = ${OpenEXR_INCLUDE_DIR}")
-  #   message(STATUS "      OpenEXR_INCLUDE_DIRS = ${OpenEXR_INCLUDE_DIRS}")
-  #   set(USE_OPENEXR TRUE CACHE BOOL "Add OpenEXR support")
-  #   include_directories( ${OpenEXR_INCLUDE_DIRS} ) 
-  #   add_definitions(-DOJPH_ENABLE_OPENEXR_SUPPORT)
-  # else()
-  #   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 )
-
-  #find_package(OpenEXR 3 CONFIG 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")
@@ -99,52 +66,6 @@ if( OJPH_ENABLE_OPENEXR_SUPPORT )
     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}")