Refactor OpenJPH import

Author: palemieux

cmake/LibraryDefine.cmake

@@ -24,10 +24,7 @@ function(OPENEXR_DEFINE_LIBRARY libname)
                           PRIVATE cxx_std_${OPENEXR_CXX_STANDARD}
                           INTERFACE cxx_std_17 )
 
-  # we are embedding OpenJPH
-  target_include_directories(${objlib} PRIVATE ${OPENJPH_OPENJPH_INCLUDE_DIRS})
-
-  # we are embedding libdeflate
+                          # we are embedding libdeflate
   target_include_directories(${objlib} PRIVATE ${EXR_DEFLATE_INCLUDE_DIR})
 
   if(OPENEXR_CURLIB_PRIV_EXPORT AND BUILD_SHARED_LIBS)
@@ -43,7 +40,7 @@ function(OPENEXR_DEFINE_LIBRARY libname)
   if(OPENEXR_CURLIB_CURBINDIR)
     target_include_directories(${objlib} PRIVATE $<BUILD_INTERFACE:${OPENEXR_CURLIB_CURBINDIR}>)
   endif()
-  target_link_libraries(${objlib} PUBLIC ${PROJECT_NAME}::Config ${OPENEXR_CURLIB_DEPENDENCIES} ${CMAKE_DL_LIBS} ${OPENJPH_LIBRARIES})
+  target_link_libraries(${objlib} PUBLIC ${PROJECT_NAME}::Config ${OPENEXR_CURLIB_DEPENDENCIES} ${CMAKE_DL_LIBS} openjph)
   if(OPENEXR_CURLIB_PRIVATE_DEPS)
     target_link_libraries(${objlib} PRIVATE ${OPENEXR_CURLIB_PRIVATE_DEPS})
   endif()

cmake/OpenEXRSetup.cmake

@@ -305,14 +305,13 @@ endif()
 message(STATUS "Locating OpenJPH")
 
 option(OPENEXR_OJPH_USE_FINDPACKAGE "Use find_package instead of downloading OpenJPH from a git repo" OFF)
-set(OPENEXR_OJPH_REPO "https://github.com/aous72/OpenJPH.git" CACHE STRING "OpenJPH Git repo URI")
-set(OPENEXR_OJPH_TAG "supporting_differing_components" CACHE STRING "OpenJPH Git repo tag")
+set(OPENEXR_OJPH_REPO "https://github.com/palemieux/OpenJPH.git" CACHE STRING "OpenJPH Git repo URI")
+set(OPENEXR_OJPH_TAG "add-export" CACHE STRING "OpenJPH Git repo tag")
 
 if (NOT (OPENJPH_INCLUDE_DIRS AND OPENJPH_LIBRARIES))
   if (OPENEXR_OJPH_USE_FINDPACKAGE)
-    find_package(openjph 0.19)
-
-    message(STATUS "Using OpenJPH at ${OPENJPH_LIBRARIES}.")
+    find_package(openjph 0.19 REQUIRED)
+    message(STATUS "Found OpenJPH locally.")
   else()
     include(FetchContent)
     FetchContent_Declare(
@@ -326,29 +325,18 @@ if (NOT (OPENJPH_INCLUDE_DIRS AND OPENJPH_LIBRARIES))
     set(OJPH_BUILD_EXECUTABLES OFF CACHE BOOL "" FORCE)
     FetchContent_MakeAvailable(openjph)
     install(
-    TARGETS openjph
-    EXPORT ${PROJECT_NAME}
-      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-      INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-      PUBLIC_HEADER
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENEXR_OUTPUT_SUBDIR}
+      TARGETS openjph
+      EXPORT ${PROJECT_NAME}
     )
     set_target_properties(openjph PROPERTIES
       RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
     )
-
-    set(OPENJPH_INCLUDE_DIRS "${openjph_SOURCE_DIR}/src/core/common")
-    set(OPENJPH_LIBRARIES openjph)
+    include_directories("${openjph_SOURCE_DIR}/src/core/common")
 
     message(STATUS "Building OpenJPH from ${OPENEXR_OJPH_REPO}.")
   endif()
 endif()
 
-if (NOT (OPENJPH_INCLUDE_DIRS AND OPENJPH_LIBRARIES))
-  message(SEND_ERROR "OpenJPH could not be found.")
-endif()
 
 #######################################
 # Find or install Imath