Add KDU

Author: palemieux

CMakePresets.json

@@ -1,24 +1,36 @@
 {
-    "version": 3,
-    "cmakeMinimumRequired": {
+  "version": 3,
+  "cmakeMinimumRequired": {
     "major": 3,
-        "minor": 15,
-        "patch": 0
+    "minor": 15,
+    "patch": 0
+  },
+  "configurePresets": [
+    {
+      "name": "oss_fuzz",
+      "cacheVariables": {
+        "CMAKE_VERBOSE_MAKEFILE": "ON",
+        "BUILD_SHARED_LIBS": "OFF",
+        "OPENEXR_FORCE_INTERNAL_IMATH": "ON",
+        "OPENEXR_FORCE_INTERNAL_DEFLATE": "ON",
+        "OPENEXR_FORCE_INTERNAL_OPENJPH": "ON",
+        "OPENEXR_BUILD_TOOLS": "OFF",
+        "OPENEXR_BUILD_EXAMPLES": "OFF",
+        "OPENEXR_BUILD_DOCS": "OFF",
+        "OPENEXR_BUILD_OSS_FUZZ": "ON"
+      }
     },
-    "configurePresets": [
-        {
-            "name": "oss_fuzz",
-            "cacheVariables": {
-                "CMAKE_VERBOSE_MAKEFILE": "ON",
-                "BUILD_SHARED_LIBS": "OFF",
-                "OPENEXR_FORCE_INTERNAL_IMATH": "ON",
-                "OPENEXR_FORCE_INTERNAL_DEFLATE": "ON",
-                "OPENEXR_FORCE_INTERNAL_OPENJPH": "ON",
-                "OPENEXR_BUILD_TOOLS": "OFF",
-                "OPENEXR_BUILD_EXAMPLES": "OFF",
-                "OPENEXR_BUILD_DOCS": "OFF",
-                "OPENEXR_BUILD_OSS_FUZZ": "ON"
-            }
-        }
-    ]
-}
+    {
+      "name": "GCC",
+      "displayName": "GCC 9.4.0 x86_64-linux-gnu",
+      "description": "Using compilers: C = /usr/bin/gcc, CXX = /usr/bin/g++",
+      "binaryDir": "${sourceDir}/out/build/${presetName}",
+      "cacheVariables": {
+        "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}",
+        "CMAKE_C_COMPILER": "/usr/bin/gcc",
+        "CMAKE_CXX_COMPILER": "/usr/bin/g++",
+        "CMAKE_BUILD_TYPE": "Debug"
+      }
+    }
+  ]
+}

cmake/LibraryDefine.cmake

@@ -17,6 +17,16 @@ function(OPENEXR_DEFINE_LIBRARY libname)
     ${OPENEXR_CURLIB_HEADERS}
     ${OPENEXR_CURLIB_SOURCES})
 
+  # KDU
+  if(KDU_LIBRARY)
+    message("Using Kakadu SDK instead of OpenJPH")
+    target_include_directories(${objlib} PRIVATE ${KDU_INCLUDE_DIR})
+    target_compile_definitions(${objlib} PRIVATE KDU_AVAILABLE=1)
+    target_link_libraries(${objlib} PUBLIC ${PROJECT_NAME}::Config ${OPENEXR_CURLIB_DEPENDENCIES} ${KDU_LIBRARY} ${CMAKE_DL_LIBS} openjph)
+  else()
+    target_link_libraries(${objlib} PUBLIC ${PROJECT_NAME}::Config ${OPENEXR_CURLIB_DEPENDENCIES} ${CMAKE_DL_LIBS} openjph)
+  endif()
+
   # Use ${OPENEXR_CXX_STANDARD} to determine the standard we use to compile
   # OpenEXR itself. The headers will use string_view and such, so ensure
   # the user is at least 17, but could be higher

cmake/OpenEXRSetup.cmake

@@ -317,6 +317,22 @@ else()
 endif()
 
 
+#######################################
+# Get KDU
+#######################################
+
+message(STATUS "Fetching KDU")
+find_path(KDU_INCLUDE_DIR kdu_args.h PATH_SUFFIXES kakadu kdu)
+find_library(KDU_LIBRARY NAMES kdu_a84R PATH_SUFFIXES kakadu kdu)
+
+if(NOT(KDU_INCLUDE_DIR) OR NOT(KDU_LIBRARY))
+  message("Kakadu SDK not found: ${KDU_LIBRARY} and ${KDU_INCLUDE_DIR}.")
+  set(KDU_INCLUDE_DIR CACHE PATH "" FORCE)
+  set(KDU_LIBRARY CACHE PATH "" FORCE)
+else()
+  message("Kakadu SDK found: ${KDU_LIBRARY} and ${KDU_INCLUDE_DIR}.")
+endif()
+
 #######################################
 # Find or download OpenJPH
 #######################################