CMake: detect JPEG XL

Author: kmilos

CMakeLists.txt

@@ -80,6 +80,7 @@ else()
   set(ALLOW_DOWNLOADING_PUGIXML OFF CACHE BOOL "If pugixml src tree is not found in location specified by PUGIXML_PATH, do fetch the archive from internet" FORCE)
 endif()
 option(WITH_JPEG "Enable JPEG support for DNG Lossy JPEG support" ON)
+option(WITH_JXL "Enable JPEG XL support for DNG JPEG XL support" ON)
 option(WITH_ZLIB "Enable ZLIB support for DNG deflate support" ON)
 if(WITH_ZLIB)
   option(USE_BUNDLED_ZLIB "Build and use zlib in-tree" OFF)

cmake/Modules/FindJXL.cmake

@@ -0,0 +1,33 @@
+# Find libjxl
+# Will define:
+# - JXL_FOUND
+# - JXL_INCLUDE_DIRS directory to include for libjxl headers
+# - JXL_LIBRARIES libraries to link to
+# - JXL_VERSION
+
+find_package(PkgConfig QUIET REQUIRED)
+pkg_check_modules(JXL_PKGCONF QUIET libjxl)
+
+if(JXL_PKGCONF_VERSION)
+  set(JXL_VERSION ${JXL_PKGCONF_VERSION})
+endif()
+
+find_path(JXL_INCLUDE_DIR
+  NAMES jxl/decode.h
+  HINTS ${JXL_PKGCONF_INCLUDE_DIRS})
+mark_as_advanced(JXL_INCLUDE_DIR)
+
+find_library(JXL_LIBRARY
+  NAMES jxl
+  HINTS ${JXL_PKGCONF_LIBRARY_DIRS})
+mark_as_advanced(JXL_LIBRARY)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(JXL
+  REQUIRED_VARS JXL_LIBRARY JXL_INCLUDE_DIR
+  VERSION_VAR JXL_VERSION)
+
+if(JXL_FOUND)
+  set(JXL_INCLUDE_DIRS ${JXL_INCLUDE_DIR})
+  set(JXL_LIBRARIES ${JXL_LIBRARY})
+endif()

cmake/src-dependencies.cmake

@@ -184,6 +184,33 @@ else()
 endif()
 add_feature_info("Lossy JPEG decoding" HAVE_JPEG "used for DNG Lossy JPEG compression decoding")
 
+unset(HAVE_JXL)
+if(WITH_JXL)
+  message(STATUS "Looking for JPEG XL")
+  find_package(JXL)
+  if(NOT JXL_FOUND)
+    message(SEND_ERROR "Did not find JPEG XL! Either make it find JPEG XL, or pass -DWITH_JXL=OFF to disable JPEG XL.")
+  else()
+    message(STATUS "Looking for JPEG XL - found")
+    set(HAVE_JXL 1)
+
+    if(NOT TARGET JXL::jxl)
+      add_library(JXL::jxl INTERFACE IMPORTED)
+      set_property(TARGET JXL::jxl PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${JXL_INCLUDE_DIRS}")
+      set_property(TARGET JXL::jxl PROPERTY INTERFACE_LINK_LIBRARIES "${JXL_LIBRARIES}")
+    endif()
+
+    target_link_libraries(rawspeed PRIVATE JXL::jxl)
+    set_package_properties(JXL PROPERTIES
+                           TYPE RECOMMENDED
+                           DESCRIPTION "library for handling the JPEG XL image data format, implements a JPEG XL codec"
+                           PURPOSE "Used for decoding DNG JPEG XL compression")
+  endif()
+else()
+  message(STATUS "JPEG XL is disabled, DNG JPEG XL support won't be available.")
+endif()
+add_feature_info("JPEG XL decoding" HAVE_JXL "used for DNG JPEG XL compression decoding")
+
 unset(HAVE_ZLIB)
 if (WITH_ZLIB)
   message(STATUS "Looking for ZLIB")

src/config.h.in

@@ -65,6 +65,8 @@ static_assert(RAWSPEED_LARGEPAGESIZE >= RAWSPEED_PAGESIZE,
 #cmakedefine HAVE_JPEG
 #cmakedefine HAVE_JPEG_MEM_SRC
 
+#cmakedefine HAVE_JXL
+
 #cmakedefine HAVE_CXX_THREAD_LOCAL
 #cmakedefine HAVE_GCC_THREAD_LOCAL