diff --git a/AboutThisBuild.txt.in b/AboutThisBuild.txt.in index 065b6c6cc..7c42f244e 100644 --- a/AboutThisBuild.txt.in +++ b/AboutThisBuild.txt.in @@ -6,9 +6,9 @@ Compiler: ${COMPILER_INFO} Processor: ${PROC_LABEL} System: ${SYSTEM} Bit depth: ${PROC_BIT_DEPTH} -Gtkmm: V${GTKMM_VERSION} -Lensfun: V${LENSFUN_VERSION} -libjxl: V${JXL_VERSION} +Gtkmm: ${GTKMM_VERSION} +Lensfun: ${LENSFUN_VERSION} +libjxl: ${JXL_VERSION} Build type: ${BUILD_TYPE} Build flags: ${CXX_FLAGS} Link flags: ${LFLAGS} diff --git a/CMakeLists.txt b/CMakeLists.txt index b6c053dd0..18b4ef04f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -569,11 +569,14 @@ if(JXL_FOUND) list(APPEND JXL_LIBRARIES ${JXLTHREADS_LIBRARIES}) else() message(STATUS " JXL support disabled by WITH_JXL = ${WITH_JXL}") + set(JXL_VERSION "Disabled") set(JXL_INCLUDE_DIRS "") set(JXL_LIBRARIES "") set(JXLTHREADS_INCLUDE_DIRS "") set(JXLTHREADS_LIBRARIES "") endif() +else() + set(JXL_VERSION "Not installed") endif() # Check for libcanberra-gtk3 (sound events on Linux):