Merge branch 'dev' into libraw-copylib

rtengine/CMakeLists.txt

@@ -45,6 +45,9 @@ endif()
 if(EXIV2_INCLUDE_DIRS)
     include_directories("${EXIV2_INCLUDE_DIRS}")
 endif()
+if(JXL_INCLUDE_DIRS)
+    include_directories("${JXL_INCLUDE_DIRS}")
+endif()
 if(NOT WITH_SYSTEM_LIBRAW)
     include_directories("${CMAKE_SOURCE_DIR}/rtengine/libraw")
 else()
@@ -251,6 +254,7 @@ target_link_libraries(rtengine
     ${RSVG_LIBRARIES}
     ${KLT_LIBRARIES}
     ${EXIV2_LIBRARIES}
+    ${JXL_LIBRARIES}
     ${LIBRAW_LIBRARIES}
     )